nextcloud / server

apps/files_sharing/lib/Notification/Listener.php

Indentation +93 added lines, -93 removed lines

@@ -37,97 +37,97 @@
 
 class Listener {
 
-	/** @var INotificationManager */
-	protected $notificationManager;
-	/** @var IShareManager */
-	protected $shareManager;
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	public function __construct(
-		INotificationManager $notificationManager,
-		IShareManager $shareManager,
-		IGroupManager $groupManager
-	) {
-		$this->notificationManager = $notificationManager;
-		$this->shareManager = $shareManager;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * @param GenericEvent $event
-	 */
-	public function shareNotification(GenericEvent $event): void {
-		/** @var IShare $share */
-		$share = $event->getSubject();
-		$notification = $this->instantiateNotification($share);
-
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$notification->setSubject(Notifier::INCOMING_USER_SHARE)
-				->setUser($share->getSharedWith());
-			$this->notificationManager->notify($notification);
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$notification->setSubject(Notifier::INCOMING_GROUP_SHARE);
-			$group = $this->groupManager->get($share->getSharedWith());
-
-			foreach ($group->getUsers() as $user) {
-				if ($user->getUID() === $share->getShareOwner() ||
-					$user->getUID() === $share->getSharedBy()) {
-					continue;
-				}
-
-				$notification->setUser($user->getUID());
-				$this->notificationManager->notify($notification);
-			}
-		}
-	}
-
-	/**
-	 * @param GenericEvent $event
-	 */
-	public function userAddedToGroup(GenericEvent $event): void {
-		/** @var IGroup $group */
-		$group = $event->getSubject();
-		/** @var IUser $user */
-		$user = $event->getArgument('user');
-
-		$offset = 0;
-		while (true) {
-			$shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, 50, $offset);
-			if (empty($shares)) {
-				break;
-			}
-
-			foreach ($shares as $share) {
-				if ($share->getSharedWith() !== $group->getGID()) {
-					continue;
-				}
-
-				if ($user->getUID() === $share->getShareOwner() ||
-					$user->getUID() === $share->getSharedBy()) {
-					continue;
-				}
-
-				$notification = $this->instantiateNotification($share);
-				$notification->setSubject(Notifier::INCOMING_GROUP_SHARE)
-					->setUser($user->getUID());
-				$this->notificationManager->notify($notification);
-			}
-			$offset += 50;
-		}
-	}
-
-	/**
-	 * @param IShare $share
-	 * @return INotification
-	 */
-	protected function instantiateNotification(IShare $share): INotification {
-		$notification = $this->notificationManager->createNotification();
-		$notification
-			->setApp('files_sharing')
-			->setObject('share', $share->getFullId())
-			->setDateTime($share->getShareTime());
-
-		return $notification;
-	}
+    /** @var INotificationManager */
+    protected $notificationManager;
+    /** @var IShareManager */
+    protected $shareManager;
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    public function __construct(
+        INotificationManager $notificationManager,
+        IShareManager $shareManager,
+        IGroupManager $groupManager
+    ) {
+        $this->notificationManager = $notificationManager;
+        $this->shareManager = $shareManager;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * @param GenericEvent $event
+     */
+    public function shareNotification(GenericEvent $event): void {
+        /** @var IShare $share */
+        $share = $event->getSubject();
+        $notification = $this->instantiateNotification($share);
+
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $notification->setSubject(Notifier::INCOMING_USER_SHARE)
+                ->setUser($share->getSharedWith());
+            $this->notificationManager->notify($notification);
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $notification->setSubject(Notifier::INCOMING_GROUP_SHARE);
+            $group = $this->groupManager->get($share->getSharedWith());
+
+            foreach ($group->getUsers() as $user) {
+                if ($user->getUID() === $share->getShareOwner() ||
+                    $user->getUID() === $share->getSharedBy()) {
+                    continue;
+                }
+
+                $notification->setUser($user->getUID());
+                $this->notificationManager->notify($notification);
+            }
+        }
+    }
+
+    /**
+     * @param GenericEvent $event
+     */
+    public function userAddedToGroup(GenericEvent $event): void {
+        /** @var IGroup $group */
+        $group = $event->getSubject();
+        /** @var IUser $user */
+        $user = $event->getArgument('user');
+
+        $offset = 0;
+        while (true) {
+            $shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, 50, $offset);
+            if (empty($shares)) {
+                break;
+            }
+
+            foreach ($shares as $share) {
+                if ($share->getSharedWith() !== $group->getGID()) {
+                    continue;
+                }
+
+                if ($user->getUID() === $share->getShareOwner() ||
+                    $user->getUID() === $share->getSharedBy()) {
+                    continue;
+                }
+
+                $notification = $this->instantiateNotification($share);
+                $notification->setSubject(Notifier::INCOMING_GROUP_SHARE)
+                    ->setUser($user->getUID());
+                $this->notificationManager->notify($notification);
+            }
+            $offset += 50;
+        }
+    }
+
+    /**
+     * @param IShare $share
+     * @return INotification
+     */
+    protected function instantiateNotification(IShare $share): INotification {
+        $notification = $this->notificationManager->createNotification();
+        $notification
+            ->setApp('files_sharing')
+            ->setObject('share', $share->getFullId())
+            ->setDateTime($share->getShareTime());
+
+        return $notification;
+    }
 }

apps/workflowengine/lib/Check/AbstractStringCheck.php

Indentation +82 added lines, -82 removed lines

@@ -27,96 +27,96 @@
 
 abstract class AbstractStringCheck implements ICheck {
 
-	/** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
-	protected $matches;
+    /** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
+    protected $matches;
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string
-	 */
-	abstract protected function getActualValue();
+    /**
+     * @return string
+     */
+    abstract protected function getActualValue();
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$actualValue = $this->getActualValue();
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $actualValue = $this->getActualValue();
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $checkValue
-	 * @param string $actualValue
-	 * @return bool
-	 */
-	protected function executeStringCheck($operator, $checkValue, $actualValue) {
-		if ($operator === 'is') {
-			return $checkValue === $actualValue;
-		} elseif ($operator === '!is') {
-			return $checkValue !== $actualValue;
-		} else {
-			$match = $this->match($checkValue, $actualValue);
-			if ($operator === 'matches') {
-				return $match === 1;
-			} else {
-				return $match === 0;
-			}
-		}
-	}
+    /**
+     * @param string $operator
+     * @param string $checkValue
+     * @param string $actualValue
+     * @return bool
+     */
+    protected function executeStringCheck($operator, $checkValue, $actualValue) {
+        if ($operator === 'is') {
+            return $checkValue === $actualValue;
+        } elseif ($operator === '!is') {
+            return $checkValue !== $actualValue;
+        } else {
+            $match = $this->match($checkValue, $actualValue);
+            if ($operator === 'matches') {
+                return $match === 1;
+            } else {
+                return $match === 0;
+            }
+        }
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
 
-		if (in_array($operator, ['matches', '!matches']) &&
-			  @preg_match($value, null) === false) {
-			throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
-		}
-	}
+        if (in_array($operator, ['matches', '!matches']) &&
+              @preg_match($value, null) === false) {
+            throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
+        }
+    }
 
-	public function supportedEntities(): array {
-		// universal by default
-		return [];
-	}
+    public function supportedEntities(): array {
+        // universal by default
+        return [];
+    }
 
-	public function isAvailableForScope(int $scope): bool {
-		// admin only by default
-		return $scope === IManager::SCOPE_ADMIN;
-	}
+    public function isAvailableForScope(int $scope): bool {
+        // admin only by default
+        return $scope === IManager::SCOPE_ADMIN;
+    }
 
-	/**
-	 * @param string $pattern
-	 * @param string $subject
-	 * @return int|bool
-	 */
-	protected function match($pattern, $subject) {
-		$patternHash = md5($pattern);
-		$subjectHash = md5($subject);
-		if (isset($this->matches[$patternHash][$subjectHash])) {
-			return $this->matches[$patternHash][$subjectHash];
-		}
-		if (!isset($this->matches[$patternHash])) {
-			$this->matches[$patternHash] = [];
-		}
-		$this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
-		return $this->matches[$patternHash][$subjectHash];
-	}
+    /**
+     * @param string $pattern
+     * @param string $subject
+     * @return int|bool
+     */
+    protected function match($pattern, $subject) {
+        $patternHash = md5($pattern);
+        $subjectHash = md5($subject);
+        if (isset($this->matches[$patternHash][$subjectHash])) {
+            return $this->matches[$patternHash][$subjectHash];
+        }
+        if (!isset($this->matches[$patternHash])) {
+            $this->matches[$patternHash] = [];
+        }
+        $this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
+        return $this->matches[$patternHash][$subjectHash];
+    }
 }

apps/settings/templates/settings/empty.php

Indentation +1 added lines, -1 removed lines

@@ -21,4 +21,4 @@
  *
  */
 
-	# used for Personal/Additional settings as fallback for legacy settings
+    # used for Personal/Additional settings as fallback for legacy settings

lib/private/Lock/MemcacheLockingProvider.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 		} elseif ($existing === 'exclusive') {
 			return $existing;
 		} else {
-			return $existing . ' shared locks';
+			return $existing.' shared locks';
 		}
 	}
 }

Indentation +83 added lines, -83 removed lines

@@ -32,95 +32,95 @@
 use OCP\Lock\LockedException;
 
 class MemcacheLockingProvider extends AbstractLockingProvider {
-	private IMemcache $memcache;
+    private IMemcache $memcache;
 
-	public function __construct(IMemcache $memcache, int $ttl = 3600) {
-		$this->memcache = $memcache;
-		$this->ttl = $ttl;
-	}
+    public function __construct(IMemcache $memcache, int $ttl = 3600) {
+        $this->memcache = $memcache;
+        $this->ttl = $ttl;
+    }
 
-	private function setTTL(string $path): void {
-		if ($this->memcache instanceof IMemcacheTTL) {
-			$this->memcache->setTTL($path, $this->ttl);
-		}
-	}
+    private function setTTL(string $path): void {
+        if ($this->memcache instanceof IMemcacheTTL) {
+            $this->memcache->setTTL($path, $this->ttl);
+        }
+    }
 
-	public function isLocked(string $path, int $type): bool {
-		$lockValue = $this->memcache->get($path);
-		if ($type === self::LOCK_SHARED) {
-			return is_int($lockValue) && $lockValue > 0;
-		} elseif ($type === self::LOCK_EXCLUSIVE) {
-			return $lockValue === 'exclusive';
-		} else {
-			return false;
-		}
-	}
+    public function isLocked(string $path, int $type): bool {
+        $lockValue = $this->memcache->get($path);
+        if ($type === self::LOCK_SHARED) {
+            return is_int($lockValue) && $lockValue > 0;
+        } elseif ($type === self::LOCK_EXCLUSIVE) {
+            return $lockValue === 'exclusive';
+        } else {
+            return false;
+        }
+    }
 
-	public function acquireLock(string $path, int $type, ?string $readablePath = null): void {
-		if ($type === self::LOCK_SHARED) {
-			if (!$this->memcache->inc($path)) {
-				throw new LockedException($path, null, $this->getExistingLockForException($path), $readablePath);
-			}
-		} else {
-			$this->memcache->add($path, 0);
-			if (!$this->memcache->cas($path, 0, 'exclusive')) {
-				throw new LockedException($path, null, $this->getExistingLockForException($path), $readablePath);
-			}
-		}
-		$this->setTTL($path);
-		$this->markAcquire($path, $type);
-	}
+    public function acquireLock(string $path, int $type, ?string $readablePath = null): void {
+        if ($type === self::LOCK_SHARED) {
+            if (!$this->memcache->inc($path)) {
+                throw new LockedException($path, null, $this->getExistingLockForException($path), $readablePath);
+            }
+        } else {
+            $this->memcache->add($path, 0);
+            if (!$this->memcache->cas($path, 0, 'exclusive')) {
+                throw new LockedException($path, null, $this->getExistingLockForException($path), $readablePath);
+            }
+        }
+        $this->setTTL($path);
+        $this->markAcquire($path, $type);
+    }
 
-	public function releaseLock(string $path, int $type): void {
-		if ($type === self::LOCK_SHARED) {
-			$ownSharedLockCount = $this->getOwnSharedLockCount($path);
-			$newValue = 0;
-			if ($ownSharedLockCount === 0) { // if we are not holding the lock, don't try to release it
-				return;
-			}
-			if ($ownSharedLockCount === 1) {
-				$removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
-				if (!$removed) { //someone else also has a shared lock, decrease only
-					$newValue = $this->memcache->dec($path);
-				}
-			} else {
-				// if we own more than one lock ourselves just decrease
-				$newValue = $this->memcache->dec($path);
-			}
+    public function releaseLock(string $path, int $type): void {
+        if ($type === self::LOCK_SHARED) {
+            $ownSharedLockCount = $this->getOwnSharedLockCount($path);
+            $newValue = 0;
+            if ($ownSharedLockCount === 0) { // if we are not holding the lock, don't try to release it
+                return;
+            }
+            if ($ownSharedLockCount === 1) {
+                $removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
+                if (!$removed) { //someone else also has a shared lock, decrease only
+                    $newValue = $this->memcache->dec($path);
+                }
+            } else {
+                // if we own more than one lock ourselves just decrease
+                $newValue = $this->memcache->dec($path);
+            }
 
-			// if we somehow release more locks then exists, reset the lock
-			if ($newValue < 0) {
-				$this->memcache->cad($path, $newValue);
-			}
-		} elseif ($type === self::LOCK_EXCLUSIVE) {
-			$this->memcache->cad($path, 'exclusive');
-		}
-		$this->markRelease($path, $type);
-	}
+            // if we somehow release more locks then exists, reset the lock
+            if ($newValue < 0) {
+                $this->memcache->cad($path, $newValue);
+            }
+        } elseif ($type === self::LOCK_EXCLUSIVE) {
+            $this->memcache->cad($path, 'exclusive');
+        }
+        $this->markRelease($path, $type);
+    }
 
-	public function changeLock(string $path, int $targetType): void {
-		if ($targetType === self::LOCK_SHARED) {
-			if (!$this->memcache->cas($path, 'exclusive', 1)) {
-				throw new LockedException($path, null, $this->getExistingLockForException($path));
-			}
-		} elseif ($targetType === self::LOCK_EXCLUSIVE) {
-			// we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
-			if (!$this->memcache->cas($path, 1, 'exclusive')) {
-				throw new LockedException($path, null, $this->getExistingLockForException($path));
-			}
-		}
-		$this->setTTL($path);
-		$this->markChange($path, $targetType);
-	}
+    public function changeLock(string $path, int $targetType): void {
+        if ($targetType === self::LOCK_SHARED) {
+            if (!$this->memcache->cas($path, 'exclusive', 1)) {
+                throw new LockedException($path, null, $this->getExistingLockForException($path));
+            }
+        } elseif ($targetType === self::LOCK_EXCLUSIVE) {
+            // we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
+            if (!$this->memcache->cas($path, 1, 'exclusive')) {
+                throw new LockedException($path, null, $this->getExistingLockForException($path));
+            }
+        }
+        $this->setTTL($path);
+        $this->markChange($path, $targetType);
+    }
 
-	private function getExistingLockForException(string $path): string {
-		$existing = $this->memcache->get($path);
-		if (!$existing) {
-			return 'none';
-		} elseif ($existing === 'exclusive') {
-			return $existing;
-		} else {
-			return $existing . ' shared locks';
-		}
-	}
+    private function getExistingLockForException(string $path): string {
+        $existing = $this->memcache->get($path);
+        if (!$existing) {
+            return 'none';
+        } elseif ($existing === 'exclusive') {
+            return $existing;
+        } else {
+            return $existing . ' shared locks';
+        }
+    }
 }

lib/public/Collaboration/Collaborators/SearchResultType.php

Indentation +34 added lines, -34 removed lines

@@ -31,44 +31,44 @@
  * @since 13.0.0
  */
 class SearchResultType {
-	/** @var string  */
-	protected $label;
+    /** @var string  */
+    protected $label;
 
-	/**
-	 * SearchResultType constructor.
-	 *
-	 * @param string $label
-	 * @since 13.0.0
-	 */
-	public function __construct($label) {
-		$this->label = $this->getValidatedType($label);
-	}
+    /**
+     * SearchResultType constructor.
+     *
+     * @param string $label
+     * @since 13.0.0
+     */
+    public function __construct($label) {
+        $this->label = $this->getValidatedType($label);
+    }
 
-	/**
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
+    /**
+     * @return string
+     * @since 13.0.0
+     */
+    public function getLabel() {
+        return $this->label;
+    }
 
-	/**
-	 * @param $type
-	 * @return string
-	 * @throws \InvalidArgumentException
-	 * @since 13.0.0
-	 */
-	protected function getValidatedType($type) {
-		$type = trim((string)$type);
+    /**
+     * @param $type
+     * @return string
+     * @throws \InvalidArgumentException
+     * @since 13.0.0
+     */
+    protected function getValidatedType($type) {
+        $type = trim((string)$type);
 
-		if ($type === '') {
-			throw new \InvalidArgumentException('Type must not be empty');
-		}
+        if ($type === '') {
+            throw new \InvalidArgumentException('Type must not be empty');
+        }
 
-		if ($type === 'exact') {
-			throw new \InvalidArgumentException('Provided type is a reserved word');
-		}
+        if ($type === 'exact') {
+            throw new \InvalidArgumentException('Provided type is a reserved word');
+        }
 
-		return $type;
-	}
+        return $type;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	 * @since 13.0.0
 	 */
 	protected function getValidatedType($type) {
-		$type = trim((string)$type);
+		$type = trim((string) $type);
 
 		if ($type === '') {
 			throw new \InvalidArgumentException('Type must not be empty');

lib/public/AppFramework/Db/Entity.php

Spacing +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
 		$instance = new static();
 
 		foreach ($params as $key => $value) {
-			$method = 'set' . ucfirst($key);
+			$method = 'set'.ucfirst($key);
 			$instance->$method($value);
 		}
 
@@ -69,7 +69,7 @@ 
 
 		foreach ($row as $key => $value) {
 			$prop = ucfirst($instance->columnToProperty($key));
-			$setter = 'set' . $prop;
+			$setter = 'set'.$prop;
 			$instance->$setter($value);
 		}
 
@@ -114,7 +114,7 @@ 
 			}
 			$this->$name = $args[0];
 		} else {
-			throw new \BadFunctionCallException($name .
+			throw new \BadFunctionCallException($name.
 				' is not a valid attribute');
 		}
 	}
@@ -128,7 +128,7 @@ 
 		if (property_exists($this, $name)) {
 			return $this->$name;
 		} else {
-			throw new \BadFunctionCallException($name .
+			throw new \BadFunctionCallException($name.
 				' is not a valid attribute');
 		}
 	}
@@ -149,7 +149,7 @@ 
 		} elseif ($this->isGetterForBoolProperty($methodName)) {
 			return $this->getter(lcfirst(substr($methodName, 2)));
 		} else {
-			throw new \BadFunctionCallException($methodName .
+			throw new \BadFunctionCallException($methodName.
 				' does not exist');
 		}
 	}
@@ -213,7 +213,7 @@ 
 			if ($column === null) {
 				$column = $part;
 			} else {
-				$column .= '_' . lcfirst($part);
+				$column .= '_'.lcfirst($part);
 			}
 		}
 
@@ -259,7 +259,7 @@ 
 			// trim '-'
 			return trim($value, '-');
 		} else {
-			throw new \BadFunctionCallException($attributeName .
+			throw new \BadFunctionCallException($attributeName.
 				' is not a valid attribute');
 		}
 	}

Indentation +250 added lines, -250 removed lines

@@ -35,254 +35,254 @@
  * @psalm-consistent-constructor
  */
 abstract class Entity {
-	/**
-	 * @var int
-	 */
-	public $id;
-
-	private array $_updatedFields = [];
-	private array $_fieldTypes = ['id' => 'integer'];
-
-	/**
-	 * Simple alternative constructor for building entities from a request
-	 * @param array $params the array which was obtained via $this->params('key')
-	 * in the controller
-	 * @since 7.0.0
-	 */
-	public static function fromParams(array $params): static {
-		$instance = new static();
-
-		foreach ($params as $key => $value) {
-			$method = 'set' . ucfirst($key);
-			$instance->$method($value);
-		}
-
-		return $instance;
-	}
-
-
-	/**
-	 * Maps the keys of the row array to the attributes
-	 * @param array $row the row to map onto the entity
-	 * @since 7.0.0
-	 */
-	public static function fromRow(array $row): static {
-		$instance = new static();
-
-		foreach ($row as $key => $value) {
-			$prop = ucfirst($instance->columnToProperty($key));
-			$setter = 'set' . $prop;
-			$instance->$setter($value);
-		}
-
-		$instance->resetUpdatedFields();
-
-		return $instance;
-	}
-
-
-	/**
-	 * @return array with attribute and type
-	 * @since 7.0.0
-	 */
-	public function getFieldTypes() {
-		return $this->_fieldTypes;
-	}
-
-
-	/**
-	 * Marks the entity as clean needed for setting the id after the insertion
-	 * @since 7.0.0
-	 */
-	public function resetUpdatedFields() {
-		$this->_updatedFields = [];
-	}
-
-	/**
-	 * Generic setter for properties
-	 * @since 7.0.0
-	 */
-	protected function setter(string $name, array $args): void {
-		// setters should only work for existing attributes
-		if (property_exists($this, $name)) {
-			if ($this->$name === $args[0]) {
-				return;
-			}
-			$this->markFieldUpdated($name);
-
-			// if type definition exists, cast to correct type
-			if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
-				$type = $this->_fieldTypes[$name];
-				if ($type === 'blob') {
-					// (B)LOB is treated as string when we read from the DB
-					if (is_resource($args[0])) {
-						$args[0] = stream_get_contents($args[0]);
-					}
-					$type = 'string';
-				}
-
-				if ($type === 'datetime') {
-					if (!$args[0] instanceof \DateTime) {
-						$args[0] = new \DateTime($args[0]);
-					}
-				} elseif ($type === 'json') {
-					if (!is_array($args[0])) {
-						$args[0] = json_decode($args[0], true);
-					}
-				} else {
-					settype($args[0], $type);
-				}
-			}
-			$this->$name = $args[0];
-		} else {
-			throw new \BadFunctionCallException($name .
-				' is not a valid attribute');
-		}
-	}
-
-	/**
-	 * Generic getter for properties
-	 * @since 7.0.0
-	 */
-	protected function getter(string $name): mixed {
-		// getters should only work for existing attributes
-		if (property_exists($this, $name)) {
-			return $this->$name;
-		} else {
-			throw new \BadFunctionCallException($name .
-				' is not a valid attribute');
-		}
-	}
-
-
-	/**
-	 * Each time a setter is called, push the part after set
-	 * into an array: for instance setId will save Id in the
-	 * updated fields array so it can be easily used to create the
-	 * getter method
-	 * @since 7.0.0
-	 */
-	public function __call(string $methodName, array $args) {
-		if (strpos($methodName, 'set') === 0) {
-			$this->setter(lcfirst(substr($methodName, 3)), $args);
-		} elseif (strpos($methodName, 'get') === 0) {
-			return $this->getter(lcfirst(substr($methodName, 3)));
-		} elseif ($this->isGetterForBoolProperty($methodName)) {
-			return $this->getter(lcfirst(substr($methodName, 2)));
-		} else {
-			throw new \BadFunctionCallException($methodName .
-				' does not exist');
-		}
-	}
-
-	/**
-	 * @param string $methodName
-	 * @return bool
-	 * @since 18.0.0
-	 */
-	protected function isGetterForBoolProperty(string $methodName): bool {
-		if (strpos($methodName, 'is') === 0) {
-			$fieldName = lcfirst(substr($methodName, 2));
-			return isset($this->_fieldTypes[$fieldName]) && strpos($this->_fieldTypes[$fieldName], 'bool') === 0;
-		}
-		return false;
-	}
-
-	/**
-	 * Mark am attribute as updated
-	 * @param string $attribute the name of the attribute
-	 * @since 7.0.0
-	 */
-	protected function markFieldUpdated(string $attribute): void {
-		$this->_updatedFields[$attribute] = true;
-	}
-
-
-	/**
-	 * Transform a database columnname to a property
-	 * @param string $columnName the name of the column
-	 * @return string the property name
-	 * @since 7.0.0
-	 */
-	public function columnToProperty($columnName) {
-		$parts = explode('_', $columnName);
-		$property = null;
-
-		foreach ($parts as $part) {
-			if ($property === null) {
-				$property = $part;
-			} else {
-				$property .= ucfirst($part);
-			}
-		}
-
-		return $property;
-	}
-
-
-	/**
-	 * Transform a property to a database column name
-	 * @param string $property the name of the property
-	 * @return string the column name
-	 * @since 7.0.0
-	 */
-	public function propertyToColumn($property) {
-		$parts = preg_split('/(?=[A-Z])/', $property);
-		$column = null;
-
-		foreach ($parts as $part) {
-			if ($column === null) {
-				$column = $part;
-			} else {
-				$column .= '_' . lcfirst($part);
-			}
-		}
-
-		return $column;
-	}
-
-
-	/**
-	 * @return array array of updated fields for update query
-	 * @since 7.0.0
-	 */
-	public function getUpdatedFields() {
-		return $this->_updatedFields;
-	}
-
-
-	/**
-	 * Adds type information for a field so that its automatically casted to
-	 * that value once its being returned from the database
-	 * @param string $fieldName the name of the attribute
-	 * @param string $type the type which will be used to call settype()
-	 * @since 7.0.0
-	 */
-	protected function addType($fieldName, $type) {
-		$this->_fieldTypes[$fieldName] = $type;
-	}
-
-
-	/**
-	 * Slugify the value of a given attribute
-	 * Warning: This doesn't result in a unique value
-	 * @param string $attributeName the name of the attribute, which value should be slugified
-	 * @return string slugified value
-	 * @since 7.0.0
-	 * @deprecated 24.0.0
-	 */
-	public function slugify($attributeName) {
-		// toSlug should only work for existing attributes
-		if (property_exists($this, $attributeName)) {
-			$value = $this->$attributeName;
-			// replace everything except alphanumeric with a single '-'
-			$value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
-			$value = strtolower($value);
-			// trim '-'
-			return trim($value, '-');
-		} else {
-			throw new \BadFunctionCallException($attributeName .
-				' is not a valid attribute');
-		}
-	}
+    /**
+     * @var int
+     */
+    public $id;
+
+    private array $_updatedFields = [];
+    private array $_fieldTypes = ['id' => 'integer'];
+
+    /**
+     * Simple alternative constructor for building entities from a request
+     * @param array $params the array which was obtained via $this->params('key')
+     * in the controller
+     * @since 7.0.0
+     */
+    public static function fromParams(array $params): static {
+        $instance = new static();
+
+        foreach ($params as $key => $value) {
+            $method = 'set' . ucfirst($key);
+            $instance->$method($value);
+        }
+
+        return $instance;
+    }
+
+
+    /**
+     * Maps the keys of the row array to the attributes
+     * @param array $row the row to map onto the entity
+     * @since 7.0.0
+     */
+    public static function fromRow(array $row): static {
+        $instance = new static();
+
+        foreach ($row as $key => $value) {
+            $prop = ucfirst($instance->columnToProperty($key));
+            $setter = 'set' . $prop;
+            $instance->$setter($value);
+        }
+
+        $instance->resetUpdatedFields();
+
+        return $instance;
+    }
+
+
+    /**
+     * @return array with attribute and type
+     * @since 7.0.0
+     */
+    public function getFieldTypes() {
+        return $this->_fieldTypes;
+    }
+
+
+    /**
+     * Marks the entity as clean needed for setting the id after the insertion
+     * @since 7.0.0
+     */
+    public function resetUpdatedFields() {
+        $this->_updatedFields = [];
+    }
+
+    /**
+     * Generic setter for properties
+     * @since 7.0.0
+     */
+    protected function setter(string $name, array $args): void {
+        // setters should only work for existing attributes
+        if (property_exists($this, $name)) {
+            if ($this->$name === $args[0]) {
+                return;
+            }
+            $this->markFieldUpdated($name);
+
+            // if type definition exists, cast to correct type
+            if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
+                $type = $this->_fieldTypes[$name];
+                if ($type === 'blob') {
+                    // (B)LOB is treated as string when we read from the DB
+                    if (is_resource($args[0])) {
+                        $args[0] = stream_get_contents($args[0]);
+                    }
+                    $type = 'string';
+                }
+
+                if ($type === 'datetime') {
+                    if (!$args[0] instanceof \DateTime) {
+                        $args[0] = new \DateTime($args[0]);
+                    }
+                } elseif ($type === 'json') {
+                    if (!is_array($args[0])) {
+                        $args[0] = json_decode($args[0], true);
+                    }
+                } else {
+                    settype($args[0], $type);
+                }
+            }
+            $this->$name = $args[0];
+        } else {
+            throw new \BadFunctionCallException($name .
+                ' is not a valid attribute');
+        }
+    }
+
+    /**
+     * Generic getter for properties
+     * @since 7.0.0
+     */
+    protected function getter(string $name): mixed {
+        // getters should only work for existing attributes
+        if (property_exists($this, $name)) {
+            return $this->$name;
+        } else {
+            throw new \BadFunctionCallException($name .
+                ' is not a valid attribute');
+        }
+    }
+
+
+    /**
+     * Each time a setter is called, push the part after set
+     * into an array: for instance setId will save Id in the
+     * updated fields array so it can be easily used to create the
+     * getter method
+     * @since 7.0.0
+     */
+    public function __call(string $methodName, array $args) {
+        if (strpos($methodName, 'set') === 0) {
+            $this->setter(lcfirst(substr($methodName, 3)), $args);
+        } elseif (strpos($methodName, 'get') === 0) {
+            return $this->getter(lcfirst(substr($methodName, 3)));
+        } elseif ($this->isGetterForBoolProperty($methodName)) {
+            return $this->getter(lcfirst(substr($methodName, 2)));
+        } else {
+            throw new \BadFunctionCallException($methodName .
+                ' does not exist');
+        }
+    }
+
+    /**
+     * @param string $methodName
+     * @return bool
+     * @since 18.0.0
+     */
+    protected function isGetterForBoolProperty(string $methodName): bool {
+        if (strpos($methodName, 'is') === 0) {
+            $fieldName = lcfirst(substr($methodName, 2));
+            return isset($this->_fieldTypes[$fieldName]) && strpos($this->_fieldTypes[$fieldName], 'bool') === 0;
+        }
+        return false;
+    }
+
+    /**
+     * Mark am attribute as updated
+     * @param string $attribute the name of the attribute
+     * @since 7.0.0
+     */
+    protected function markFieldUpdated(string $attribute): void {
+        $this->_updatedFields[$attribute] = true;
+    }
+
+
+    /**
+     * Transform a database columnname to a property
+     * @param string $columnName the name of the column
+     * @return string the property name
+     * @since 7.0.0
+     */
+    public function columnToProperty($columnName) {
+        $parts = explode('_', $columnName);
+        $property = null;
+
+        foreach ($parts as $part) {
+            if ($property === null) {
+                $property = $part;
+            } else {
+                $property .= ucfirst($part);
+            }
+        }
+
+        return $property;
+    }
+
+
+    /**
+     * Transform a property to a database column name
+     * @param string $property the name of the property
+     * @return string the column name
+     * @since 7.0.0
+     */
+    public function propertyToColumn($property) {
+        $parts = preg_split('/(?=[A-Z])/', $property);
+        $column = null;
+
+        foreach ($parts as $part) {
+            if ($column === null) {
+                $column = $part;
+            } else {
+                $column .= '_' . lcfirst($part);
+            }
+        }
+
+        return $column;
+    }
+
+
+    /**
+     * @return array array of updated fields for update query
+     * @since 7.0.0
+     */
+    public function getUpdatedFields() {
+        return $this->_updatedFields;
+    }
+
+
+    /**
+     * Adds type information for a field so that its automatically casted to
+     * that value once its being returned from the database
+     * @param string $fieldName the name of the attribute
+     * @param string $type the type which will be used to call settype()
+     * @since 7.0.0
+     */
+    protected function addType($fieldName, $type) {
+        $this->_fieldTypes[$fieldName] = $type;
+    }
+
+
+    /**
+     * Slugify the value of a given attribute
+     * Warning: This doesn't result in a unique value
+     * @param string $attributeName the name of the attribute, which value should be slugified
+     * @return string slugified value
+     * @since 7.0.0
+     * @deprecated 24.0.0
+     */
+    public function slugify($attributeName) {
+        // toSlug should only work for existing attributes
+        if (property_exists($this, $attributeName)) {
+            $value = $this->$attributeName;
+            // replace everything except alphanumeric with a single '-'
+            $value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
+            $value = strtolower($value);
+            // trim '-'
+            return trim($value, '-');
+        } else {
+            throw new \BadFunctionCallException($attributeName .
+                ' is not a valid attribute');
+        }
+    }
 }

lib/public/AppFramework/Http/RedirectResponse.php

Indentation +19 added lines, -19 removed lines

@@ -33,27 +33,27 @@
  * @since 7.0.0
  */
 class RedirectResponse extends Response {
-	private $redirectURL;
+    private $redirectURL;
 
-	/**
-	 * Creates a response that redirects to a url
-	 * @param string $redirectURL the url to redirect to
-	 * @since 7.0.0
-	 */
-	public function __construct($redirectURL) {
-		parent::__construct();
+    /**
+     * Creates a response that redirects to a url
+     * @param string $redirectURL the url to redirect to
+     * @since 7.0.0
+     */
+    public function __construct($redirectURL) {
+        parent::__construct();
 
-		$this->redirectURL = $redirectURL;
-		$this->setStatus(Http::STATUS_SEE_OTHER);
-		$this->addHeader('Location', $redirectURL);
-	}
+        $this->redirectURL = $redirectURL;
+        $this->setStatus(Http::STATUS_SEE_OTHER);
+        $this->addHeader('Location', $redirectURL);
+    }
 
 
-	/**
-	 * @return string the url to redirect
-	 * @since 7.0.0
-	 */
-	public function getRedirectURL() {
-		return $this->redirectURL;
-	}
+    /**
+     * @return string the url to redirect
+     * @since 7.0.0
+     */
+    public function getRedirectURL() {
+        return $this->redirectURL;
+    }
 }

lib/private/IntegrityCheck/Helpers/FileAccessHelper.php

Indentation +49 added lines, -49 removed lines

@@ -34,57 +34,57 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class FileAccessHelper {
-	/**
-	 * Wrapper around file_get_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @return string|false
-	 */
-	public function file_get_contents(string $filename) {
-		return file_get_contents($filename);
-	}
+    /**
+     * Wrapper around file_get_contents($filename, $data)
+     *
+     * @param string $filename
+     * @return string|false
+     */
+    public function file_get_contents(string $filename) {
+        return file_get_contents($filename);
+    }
 
-	/**
-	 * Wrapper around file_exists($filename)
-	 *
-	 * @param string $filename
-	 * @return bool
-	 */
-	public function file_exists(string $filename): bool {
-		return file_exists($filename);
-	}
+    /**
+     * Wrapper around file_exists($filename)
+     *
+     * @param string $filename
+     * @return bool
+     */
+    public function file_exists(string $filename): bool {
+        return file_exists($filename);
+    }
 
-	/**
-	 * Wrapper around file_put_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @param string $data
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function file_put_contents(string $filename, string $data): int {
-		$bytesWritten = @file_put_contents($filename, $data);
-		if ($bytesWritten === false || $bytesWritten !== \strlen($data)) {
-			throw new \Exception('Failed to write into ' . $filename);
-		}
-		return $bytesWritten;
-	}
+    /**
+     * Wrapper around file_put_contents($filename, $data)
+     *
+     * @param string $filename
+     * @param string $data
+     * @return int
+     * @throws \Exception
+     */
+    public function file_put_contents(string $filename, string $data): int {
+        $bytesWritten = @file_put_contents($filename, $data);
+        if ($bytesWritten === false || $bytesWritten !== \strlen($data)) {
+            throw new \Exception('Failed to write into ' . $filename);
+        }
+        return $bytesWritten;
+    }
 
-	/**
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_writable(string $path): bool {
-		return is_writable($path);
-	}
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function is_writable(string $path): bool {
+        return is_writable($path);
+    }
 
-	/**
-	 * @param string $path
-	 * @throws \Exception
-	 */
-	public function assertDirectoryExists(string $path) {
-		if (!is_dir($path)) {
-			throw new \Exception('Directory ' . $path . ' does not exist.');
-		}
-	}
+    /**
+     * @param string $path
+     * @throws \Exception
+     */
+    public function assertDirectoryExists(string $path) {
+        if (!is_dir($path)) {
+            throw new \Exception('Directory ' . $path . ' does not exist.');
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 	public function file_put_contents(string $filename, string $data): int {
 		$bytesWritten = @file_put_contents($filename, $data);
 		if ($bytesWritten === false || $bytesWritten !== \strlen($data)) {
-			throw new \Exception('Failed to write into ' . $filename);
+			throw new \Exception('Failed to write into '.$filename);
 		}
 		return $bytesWritten;
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	public function assertDirectoryExists(string $path) {
 		if (!is_dir($path)) {
-			throw new \Exception('Directory ' . $path . ' does not exist.');
+			throw new \Exception('Directory '.$path.' does not exist.');
 		}
 	}
 }

lib/private/IntegrityCheck/Helpers/AppLocator.php

Indentation +22 added lines, -22 removed lines

@@ -34,27 +34,27 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class AppLocator {
-	/**
-	 * Provides \OC_App::getAppPath($appId)
-	 *
-	 * @param string $appId
-	 * @return string
-	 * @throws \Exception If the app cannot be found
-	 */
-	public function getAppPath(string $appId): string {
-		$path = \OC_App::getAppPath($appId);
-		if ($path === false) {
-			throw new \Exception('App not found');
-		}
-		return $path;
-	}
+    /**
+     * Provides \OC_App::getAppPath($appId)
+     *
+     * @param string $appId
+     * @return string
+     * @throws \Exception If the app cannot be found
+     */
+    public function getAppPath(string $appId): string {
+        $path = \OC_App::getAppPath($appId);
+        if ($path === false) {
+            throw new \Exception('App not found');
+        }
+        return $path;
+    }
 
-	/**
-	 * Providers \OC_App::getAllApps()
-	 *
-	 * @return array
-	 */
-	public function getAllApps(): array {
-		return \OC_App::getAllApps();
-	}
+    /**
+     * Providers \OC_App::getAllApps()
+     *
+     * @return array
+     */
+    public function getAllApps(): array {
+        return \OC_App::getAllApps();
+    }
 }