nextcloud / server

apps/contactsinteraction/lib/Db/RecentContactMapper.php

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 			return null;
 		}
 
-		return (int)$row['last_contact'];
+		return (int) $row['last_contact'];
 	}
 
 	public function cleanUp(int $olderThan): void {

Indentation +95 added lines, -95 removed lines

@@ -17,99 +17,99 @@
  * @template-extends QBMapper<RecentContact>
  */
 class RecentContactMapper extends QBMapper {
-	public const TABLE_NAME = 'recent_contact';
-
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, self::TABLE_NAME);
-	}
-
-	/**
-	 * @return RecentContact[]
-	 */
-	public function findAll(string $uid): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$select = $qb
-			->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)));
-
-		return $this->findEntities($select);
-	}
-
-	/**
-	 * @throws DoesNotExistException
-	 */
-	public function find(string $uid, int $id): RecentContact {
-		$qb = $this->db->getQueryBuilder();
-
-		$select = $qb
-			->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, $qb::PARAM_INT)))
-			->andWhere($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)));
-
-		return $this->findEntity($select);
-	}
-
-	/**
-	 * @return RecentContact[]
-	 */
-	public function findMatch(IUser $user,
-		?string $uid,
-		?string $email,
-		?string $cloudId): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$additionalWheres = [];
-		if ($uid !== null) {
-			$additionalWheres[] = $qb->expr()->eq('uid', $qb->createNamedParameter($uid));
-		}
-		if ($email !== null) {
-			$additionalWheres[] = $qb->expr()->eq('email', $qb->createNamedParameter($email));
-		}
-		if ($cloudId !== null) {
-			$additionalWheres[] = $qb->expr()->eq('federated_cloud_id', $qb->createNamedParameter($cloudId));
-		}
-
-		$select = $qb
-			->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($user->getUID())));
-
-		if (!empty($additionalWheres)) {
-			$select->andWhere($select->expr()->orX(...$additionalWheres));
-		}
-		return $this->findEntities($select);
-	}
-
-	public function findLastUpdatedForUserId(string $uid): ?int {
-		$qb = $this->db->getQueryBuilder();
-
-		$select = $qb
-			->select('last_contact')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)))
-			->orderBy('last_contact', 'DESC')
-			->setMaxResults(1);
-
-		$cursor = $select->executeQuery();
-		$row = $cursor->fetch();
-
-		if ($row === false) {
-			return null;
-		}
-
-		return (int)$row['last_contact'];
-	}
-
-	public function cleanUp(int $olderThan): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$delete = $qb
-			->delete($this->getTableName())
-			->where($qb->expr()->lt('last_contact', $qb->createNamedParameter($olderThan)));
-
-		$delete->executeStatement();
-	}
+    public const TABLE_NAME = 'recent_contact';
+
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, self::TABLE_NAME);
+    }
+
+    /**
+     * @return RecentContact[]
+     */
+    public function findAll(string $uid): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $select = $qb
+            ->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)));
+
+        return $this->findEntities($select);
+    }
+
+    /**
+     * @throws DoesNotExistException
+     */
+    public function find(string $uid, int $id): RecentContact {
+        $qb = $this->db->getQueryBuilder();
+
+        $select = $qb
+            ->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id, $qb::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)));
+
+        return $this->findEntity($select);
+    }
+
+    /**
+     * @return RecentContact[]
+     */
+    public function findMatch(IUser $user,
+        ?string $uid,
+        ?string $email,
+        ?string $cloudId): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $additionalWheres = [];
+        if ($uid !== null) {
+            $additionalWheres[] = $qb->expr()->eq('uid', $qb->createNamedParameter($uid));
+        }
+        if ($email !== null) {
+            $additionalWheres[] = $qb->expr()->eq('email', $qb->createNamedParameter($email));
+        }
+        if ($cloudId !== null) {
+            $additionalWheres[] = $qb->expr()->eq('federated_cloud_id', $qb->createNamedParameter($cloudId));
+        }
+
+        $select = $qb
+            ->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($user->getUID())));
+
+        if (!empty($additionalWheres)) {
+            $select->andWhere($select->expr()->orX(...$additionalWheres));
+        }
+        return $this->findEntities($select);
+    }
+
+    public function findLastUpdatedForUserId(string $uid): ?int {
+        $qb = $this->db->getQueryBuilder();
+
+        $select = $qb
+            ->select('last_contact')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('actor_uid', $qb->createNamedParameter($uid)))
+            ->orderBy('last_contact', 'DESC')
+            ->setMaxResults(1);
+
+        $cursor = $select->executeQuery();
+        $row = $cursor->fetch();
+
+        if ($row === false) {
+            return null;
+        }
+
+        return (int)$row['last_contact'];
+    }
+
+    public function cleanUp(int $olderThan): void {
+        $qb = $this->db->getQueryBuilder();
+
+        $delete = $qb
+            ->delete($this->getTableName())
+            ->where($qb->expr()->lt('last_contact', $qb->createNamedParameter($olderThan)));
+
+        $delete->executeStatement();
+    }
 }

lib/private/Authentication/Events/LoginFailed.php

Indentation +13 added lines, -13 removed lines

@@ -28,21 +28,21 @@
 use OCP\EventDispatcher\Event;
 
 class LoginFailed extends Event {
-	private string $loginName;
-	private ?string $password;
+    private string $loginName;
+    private ?string $password;
 
-	public function __construct(string $loginName, ?string $password) {
-		parent::__construct();
+    public function __construct(string $loginName, ?string $password) {
+        parent::__construct();
 
-		$this->loginName = $loginName;
-		$this->password = $password;
-	}
+        $this->loginName = $loginName;
+        $this->password = $password;
+    }
 
-	public function getLoginName(): string {
-		return $this->loginName;
-	}
+    public function getLoginName(): string {
+        return $this->loginName;
+    }
 
-	public function getPassword(): ?string {
-		return $this->password;
-	}
+    public function getPassword(): ?string {
+        return $this->password;
+    }
 }

apps/admin_audit/lib/BackgroundJobs/Rotate.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	}
 
 	protected function run($argument): void {
-		$default = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+		$default = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/audit.log';
 		$this->filePath = $this->config->getAppValue('admin_audit', 'logfile', $default);
 
 		if ($this->filePath === '') {

Indentation +20 added lines, -20 removed lines

@@ -13,30 +13,30 @@
 use OCP\Log\RotationTrait;
 
 class Rotate extends TimedJob {
-	use RotationTrait;
+    use RotationTrait;
 
-	public function __construct(
-		ITimeFactory $time,
-		private IConfig $config,
-	) {
-		parent::__construct($time);
+    public function __construct(
+        ITimeFactory $time,
+        private IConfig $config,
+    ) {
+        parent::__construct($time);
 
-		$this->setInterval(60 * 60 * 3);
-	}
+        $this->setInterval(60 * 60 * 3);
+    }
 
-	protected function run($argument): void {
-		$default = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-		$this->filePath = $this->config->getAppValue('admin_audit', 'logfile', $default);
+    protected function run($argument): void {
+        $default = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+        $this->filePath = $this->config->getAppValue('admin_audit', 'logfile', $default);
 
-		if ($this->filePath === '') {
-			// default log file, nothing to do
-			return;
-		}
+        if ($this->filePath === '') {
+            // default log file, nothing to do
+            return;
+        }
 
-		$this->maxSize = $this->config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
+        $this->maxSize = $this->config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
 
-		if ($this->shouldRotateBySize()) {
-			$this->rotate();
-		}
-	}
+        if ($this->shouldRotateBySize()) {
+            $this->rotate();
+        }
+    }
 }

lib/public/Migration/IMigrationStep.php

Indentation +39 added lines, -39 removed lines

@@ -34,47 +34,47 @@
  * @since 13.0.0
  */
 interface IMigrationStep {
-	/**
-	 * Human-readable name of the migration step
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function name(): string;
+    /**
+     * Human-readable name of the migration step
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function name(): string;
 
-	/**
-	 * Human-readable description of the migration step
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function description(): string;
+    /**
+     * Human-readable description of the migration step
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function description(): string;
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @psalm-param Closure():ISchemaWrapper $schemaClosure
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options);
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @psalm-param Closure():ISchemaWrapper $schemaClosure
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options);
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @psalm-param Closure():ISchemaWrapper $schemaClosure
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options);
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @psalm-param Closure():ISchemaWrapper $schemaClosure
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options);
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @psalm-param Closure():ISchemaWrapper $schemaClosure
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options);
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @psalm-param Closure():ISchemaWrapper $schemaClosure
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options);
 }

lib/public/Migration/SimpleMigrationStep.php

Indentation +47 added lines, -47 removed lines

@@ -35,55 +35,55 @@
  * @since 13.0.0
  */
 abstract class SimpleMigrationStep implements IMigrationStep {
-	/**
-	 * Human-readable name of the migration step
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function name(): string {
-		return '';
-	}
+    /**
+     * Human-readable name of the migration step
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function name(): string {
+        return '';
+    }
 
-	/**
-	 * Human-readable description of the migration step
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function description(): string {
-		return '';
-	}
+    /**
+     * Human-readable description of the migration step
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function description(): string {
+        return '';
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @psalm-param Closure():ISchemaWrapper $schemaClosure
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @psalm-param Closure():ISchemaWrapper $schemaClosure
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @psalm-param Closure():ISchemaWrapper $schemaClosure
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		return null;
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @psalm-param Closure():ISchemaWrapper $schemaClosure
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        return null;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @psalm-param Closure():ISchemaWrapper $schemaClosure
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @psalm-param Closure():ISchemaWrapper $schemaClosure
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 }

lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
 		$controllerClassPath = explode('\\', get_class($controller));
 		$controllerShortClass = end($controllerClassPath);
-		$bruteforceProtectionAction = $controllerShortClass . '::' . $methodName;
+		$bruteforceProtectionAction = $controllerShortClass.'::'.$methodName;
 		$this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), $bruteforceProtectionAction);
 
 		if (!$this->isLinkSharingEnabled()) {

Indentation +103 added lines, -103 removed lines

@@ -20,107 +20,107 @@
 
 class PublicShareMiddleware extends Middleware {
 
-	public function __construct(
-		private IRequest $request,
-		private ISession $session,
-		private IConfig $config,
-		private IThrottler $throttler,
-	) {
-	}
-
-	public function beforeController($controller, $methodName) {
-		if (!($controller instanceof PublicShareController)) {
-			return;
-		}
-
-		$controllerClassPath = explode('\\', get_class($controller));
-		$controllerShortClass = end($controllerClassPath);
-		$bruteforceProtectionAction = $controllerShortClass . '::' . $methodName;
-		$this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), $bruteforceProtectionAction);
-
-		if (!$this->isLinkSharingEnabled()) {
-			throw new NotFoundException('Link sharing is disabled');
-		}
-
-		// We require the token parameter to be set
-		$token = $this->request->getParam('token');
-		if ($token === null) {
-			throw new NotFoundException();
-		}
-
-		// Set the token
-		$controller->setToken($token);
-
-		if (!$controller->isValidToken()) {
-			$this->throttle($bruteforceProtectionAction, $token);
-
-			$controller->shareNotFound();
-			throw new NotFoundException();
-		}
-
-		// No need to check for authentication when we try to authenticate
-		if ($methodName === 'authenticate' || $methodName === 'showAuthenticate') {
-			return;
-		}
-
-		// If authentication succeeds just continue
-		if ($controller->isAuthenticated()) {
-			return;
-		}
-
-		// If we can authenticate to this controller do it else we throw a 404 to not leak any info
-		if ($controller instanceof AuthPublicShareController) {
-			$this->session->set('public_link_authenticate_redirect', json_encode($this->request->getParams()));
-			throw new NeedAuthenticationException();
-		}
-
-		$this->throttle($bruteforceProtectionAction, $token);
-		throw new NotFoundException();
-	}
-
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if (!($controller instanceof PublicShareController)) {
-			throw $exception;
-		}
-
-		if ($exception instanceof NotFoundException) {
-			return new TemplateResponse(Application::APP_ID, 'sharenotfound', [
-				'message' => $exception->getMessage(),
-			], 'guest', Http::STATUS_NOT_FOUND);
-		}
-
-		if ($controller instanceof AuthPublicShareController && $exception instanceof NeedAuthenticationException) {
-			return $controller->getAuthenticationRedirect($this->getFunctionForRoute($this->request->getParam('_route')));
-		}
-
-		throw $exception;
-	}
-
-	private function getFunctionForRoute(string $route): string {
-		$tmp = explode('.', $route);
-		return array_pop($tmp);
-	}
-
-	/**
-	 * Check if link sharing is allowed
-	 */
-	private function isLinkSharingEnabled(): bool {
-		// Check if the shareAPI is enabled
-		if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
-			return false;
-		}
-
-		// Check whether public sharing is enabled
-		if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
-			return false;
-		}
-
-		return true;
-	}
-
-	private function throttle($bruteforceProtectionAction, $token): void {
-		$ip = $this->request->getRemoteAddress();
-		$this->throttler->sleepDelayOrThrowOnMax($ip, $bruteforceProtectionAction);
-		$this->throttler->registerAttempt($bruteforceProtectionAction, $ip, ['token' => $token]);
-	}
+    public function __construct(
+        private IRequest $request,
+        private ISession $session,
+        private IConfig $config,
+        private IThrottler $throttler,
+    ) {
+    }
+
+    public function beforeController($controller, $methodName) {
+        if (!($controller instanceof PublicShareController)) {
+            return;
+        }
+
+        $controllerClassPath = explode('\\', get_class($controller));
+        $controllerShortClass = end($controllerClassPath);
+        $bruteforceProtectionAction = $controllerShortClass . '::' . $methodName;
+        $this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), $bruteforceProtectionAction);
+
+        if (!$this->isLinkSharingEnabled()) {
+            throw new NotFoundException('Link sharing is disabled');
+        }
+
+        // We require the token parameter to be set
+        $token = $this->request->getParam('token');
+        if ($token === null) {
+            throw new NotFoundException();
+        }
+
+        // Set the token
+        $controller->setToken($token);
+
+        if (!$controller->isValidToken()) {
+            $this->throttle($bruteforceProtectionAction, $token);
+
+            $controller->shareNotFound();
+            throw new NotFoundException();
+        }
+
+        // No need to check for authentication when we try to authenticate
+        if ($methodName === 'authenticate' || $methodName === 'showAuthenticate') {
+            return;
+        }
+
+        // If authentication succeeds just continue
+        if ($controller->isAuthenticated()) {
+            return;
+        }
+
+        // If we can authenticate to this controller do it else we throw a 404 to not leak any info
+        if ($controller instanceof AuthPublicShareController) {
+            $this->session->set('public_link_authenticate_redirect', json_encode($this->request->getParams()));
+            throw new NeedAuthenticationException();
+        }
+
+        $this->throttle($bruteforceProtectionAction, $token);
+        throw new NotFoundException();
+    }
+
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if (!($controller instanceof PublicShareController)) {
+            throw $exception;
+        }
+
+        if ($exception instanceof NotFoundException) {
+            return new TemplateResponse(Application::APP_ID, 'sharenotfound', [
+                'message' => $exception->getMessage(),
+            ], 'guest', Http::STATUS_NOT_FOUND);
+        }
+
+        if ($controller instanceof AuthPublicShareController && $exception instanceof NeedAuthenticationException) {
+            return $controller->getAuthenticationRedirect($this->getFunctionForRoute($this->request->getParam('_route')));
+        }
+
+        throw $exception;
+    }
+
+    private function getFunctionForRoute(string $route): string {
+        $tmp = explode('.', $route);
+        return array_pop($tmp);
+    }
+
+    /**
+     * Check if link sharing is allowed
+     */
+    private function isLinkSharingEnabled(): bool {
+        // Check if the shareAPI is enabled
+        if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+            return false;
+        }
+
+        // Check whether public sharing is enabled
+        if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function throttle($bruteforceProtectionAction, $token): void {
+        $ip = $this->request->getRemoteAddress();
+        $this->throttler->sleepDelayOrThrowOnMax($ip, $bruteforceProtectionAction);
+        $this->throttler->registerAttempt($bruteforceProtectionAction, $ip, ['token' => $token]);
+    }
 }

lib/private/Template/JSCombiner.php

Spacing +18 added lines, -18 removed lines

@@ -63,7 +63,7 @@ 
 		$this->appData = $appData;
 		$this->urlGenerator = $urlGenerator;
 		$this->cacheFactory = $cacheFactory;
-		$this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl()));
+		$this->depsCache = $this->cacheFactory->createDistributed('JS-'.md5($this->urlGenerator->getBaseUrl()));
 		$this->config = $config;
 		$this->logger = $logger;
 	}
@@ -79,7 +79,7 @@ 
 			return false;
 		}
 
-		$path = explode('/', $root . '/' . $file);
+		$path = explode('/', $root.'/'.$file);
 
 		$fileName = array_pop($path);
 		$path = implode('/', $path);
@@ -109,9 +109,9 @@ 
 			return false;
 		}
 
-		$fileName = $fileName . '.deps';
+		$fileName = $fileName.'.deps';
 		try {
-			$deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
+			$deps = $this->depsCache->get($folder->getName().'-'.$fileName);
 			$fromCache = true;
 			if ($deps === null || $deps === '') {
 				$fromCache = false;
@@ -121,7 +121,7 @@ 
 
 			// check again
 			if ($deps === null || $deps === '') {
-				$this->logger->info('JSCombiner: deps file empty: ' . $fileName);
+				$this->logger->info('JSCombiner: deps file empty: '.$fileName);
 				return false;
 			}
 
@@ -138,7 +138,7 @@ 
 			}
 
 			if ($fromCache === false) {
-				$this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps));
+				$this->depsCache->set($folder->getName().'-'.$fileName, json_encode($deps));
 			}
 
 			return true;
@@ -155,17 +155,17 @@ 
 	 */
 	protected function cache($path, $fileName, ISimpleFolder $folder) {
 		$deps = [];
-		$fullPath = $path . '/' . $fileName;
+		$fullPath = $path.'/'.$fileName;
 		$data = json_decode(file_get_contents($fullPath));
 		$deps[$fullPath] = filemtime($fullPath);
 
 		$res = '';
 		foreach ($data as $file) {
-			$filePath = $path . '/' . $file;
+			$filePath = $path.'/'.$file;
 
 			if (is_file($filePath)) {
 				$res .= file_get_contents($filePath);
-				$res .= PHP_EOL . PHP_EOL;
+				$res .= PHP_EOL.PHP_EOL;
 				$deps[$filePath] = filemtime($filePath);
 			}
 		}
@@ -177,7 +177,7 @@ 
 			$cachedfile = $folder->newFile($fileName);
 		}
 
-		$depFileName = $fileName . '.deps';
+		$depFileName = $fileName.'.deps';
 		try {
 			$depFile = $folder->getFile($depFileName);
 		} catch (NotFoundException $e) {
@@ -185,21 +185,21 @@ 
 		}
 
 		try {
-			$gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
 		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->newFile($fileName.'.gzip'); # Safari doesn't like .gz
 		}
 
 		try {
 			$cachedfile->putContent($res);
 			$deps = json_encode($deps);
 			$depFile->putContent($deps);
-			$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+			$this->depsCache->set($folder->getName().'-'.$depFileName, $deps);
 			$gzipFile->putContent(gzencode($res, 9));
-			$this->logger->debug('JSCombiner: successfully cached: ' . $fileName);
+			$this->logger->debug('JSCombiner: successfully cached: '.$fileName);
 			return true;
-		} catch (NotPermittedException|NotFoundException $e) {
-			$this->logger->error('JSCombiner: unable to cache: ' . $fileName);
+		} catch (NotPermittedException | NotFoundException $e) {
+			$this->logger->error('JSCombiner: unable to cache: '.$fileName);
 			return false;
 		}
 	}
@@ -224,7 +224,7 @@ 
 	 */
 	public function getContent($root, $file) {
 		/** @var array $data */
-		$data = json_decode(file_get_contents($root . '/' . $file));
+		$data = json_decode(file_get_contents($root.'/'.$file));
 		if (!is_array($data)) {
 			return [];
 		}
@@ -235,7 +235,7 @@ 
 
 		$result = [];
 		foreach ($data as $f) {
-			$result[] = $path . '/' . $f;
+			$result[] = $path.'/'.$f;
 		}
 
 		return $result;

Indentation +218 added lines, -218 removed lines

@@ -16,222 +16,222 @@
 use Psr\Log\LoggerInterface;
 
 class JSCombiner {
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var ICache */
-	protected $depsCache;
-
-	/** @var SystemConfig */
-	protected $config;
-
-	protected LoggerInterface $logger;
-
-	/** @var ICacheFactory */
-	private $cacheFactory;
-
-	public function __construct(IAppData $appData,
-		IURLGenerator $urlGenerator,
-		ICacheFactory $cacheFactory,
-		SystemConfig $config,
-		LoggerInterface $logger) {
-		$this->appData = $appData;
-		$this->urlGenerator = $urlGenerator;
-		$this->cacheFactory = $cacheFactory;
-		$this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl()));
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param string $root
-	 * @param string $file
-	 * @param string $app
-	 * @return bool
-	 */
-	public function process($root, $file, $app) {
-		if ($this->config->getValue('debug') || !$this->config->getValue('installed')) {
-			return false;
-		}
-
-		$path = explode('/', $root . '/' . $file);
-
-		$fileName = array_pop($path);
-		$path = implode('/', $path);
-
-		try {
-			$folder = $this->appData->getFolder($app);
-		} catch (NotFoundException $e) {
-			// creating css appdata folder
-			$folder = $this->appData->newFolder($app);
-		}
-
-		if ($this->isCached($fileName, $folder)) {
-			return true;
-		}
-		return $this->cache($path, $fileName, $folder);
-	}
-
-	/**
-	 * @param string $fileName
-	 * @param ISimpleFolder $folder
-	 * @return bool
-	 */
-	protected function isCached($fileName, ISimpleFolder $folder) {
-		$fileName = str_replace('.json', '.js', $fileName);
-
-		if (!$folder->fileExists($fileName)) {
-			return false;
-		}
-
-		$fileName = $fileName . '.deps';
-		try {
-			$deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
-			$fromCache = true;
-			if ($deps === null || $deps === '') {
-				$fromCache = false;
-				$depFile = $folder->getFile($fileName);
-				$deps = $depFile->getContent();
-			}
-
-			// check again
-			if ($deps === null || $deps === '') {
-				$this->logger->info('JSCombiner: deps file empty: ' . $fileName);
-				return false;
-			}
-
-			$deps = json_decode($deps, true);
-
-			if ($deps === null) {
-				return false;
-			}
-
-			foreach ($deps as $file => $mtime) {
-				if (!file_exists($file) || filemtime($file) > $mtime) {
-					return false;
-				}
-			}
-
-			if ($fromCache === false) {
-				$this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps));
-			}
-
-			return true;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $fileName
-	 * @param ISimpleFolder $folder
-	 * @return bool
-	 */
-	protected function cache($path, $fileName, ISimpleFolder $folder) {
-		$deps = [];
-		$fullPath = $path . '/' . $fileName;
-		$data = json_decode(file_get_contents($fullPath));
-		$deps[$fullPath] = filemtime($fullPath);
-
-		$res = '';
-		foreach ($data as $file) {
-			$filePath = $path . '/' . $file;
-
-			if (is_file($filePath)) {
-				$res .= file_get_contents($filePath);
-				$res .= PHP_EOL . PHP_EOL;
-				$deps[$filePath] = filemtime($filePath);
-			}
-		}
-
-		$fileName = str_replace('.json', '.js', $fileName);
-		try {
-			$cachedfile = $folder->getFile($fileName);
-		} catch (NotFoundException $e) {
-			$cachedfile = $folder->newFile($fileName);
-		}
-
-		$depFileName = $fileName . '.deps';
-		try {
-			$depFile = $folder->getFile($depFileName);
-		} catch (NotFoundException $e) {
-			$depFile = $folder->newFile($depFileName);
-		}
-
-		try {
-			$gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
-		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
-		}
-
-		try {
-			$cachedfile->putContent($res);
-			$deps = json_encode($deps);
-			$depFile->putContent($deps);
-			$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
-			$gzipFile->putContent(gzencode($res, 9));
-			$this->logger->debug('JSCombiner: successfully cached: ' . $fileName);
-			return true;
-		} catch (NotPermittedException|NotFoundException $e) {
-			$this->logger->error('JSCombiner: unable to cache: ' . $fileName);
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string $fileName
-	 * @return string
-	 */
-	public function getCachedJS($appName, $fileName) {
-		$tmpfileLoc = explode('/', $fileName);
-		$fileName = array_pop($tmpfileLoc);
-		$fileName = str_replace('.json', '.js', $fileName);
-
-		return substr($this->urlGenerator->linkToRoute('core.Js.getJs', ['fileName' => $fileName, 'appName' => $appName]), strlen(\OC::$WEBROOT) + 1);
-	}
-
-	/**
-	 * @param string $root
-	 * @param string $file
-	 * @return string[]
-	 */
-	public function getContent($root, $file) {
-		/** @var array $data */
-		$data = json_decode(file_get_contents($root . '/' . $file));
-		if (!is_array($data)) {
-			return [];
-		}
-
-		$path = explode('/', $file);
-		array_pop($path);
-		$path = implode('/', $path);
-
-		$result = [];
-		foreach ($data as $f) {
-			$result[] = $path . '/' . $f;
-		}
-
-		return $result;
-	}
-
-
-	/**
-	 * Clear cache with combined javascript files
-	 *
-	 * @throws NotFoundException
-	 */
-	public function resetCache() {
-		$this->cacheFactory->createDistributed('JS-')->clear();
-		$appDirectory = $this->appData->getDirectoryListing();
-		foreach ($appDirectory as $folder) {
-			foreach ($folder->getDirectoryListing() as $file) {
-				$file->delete();
-			}
-		}
-	}
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var ICache */
+    protected $depsCache;
+
+    /** @var SystemConfig */
+    protected $config;
+
+    protected LoggerInterface $logger;
+
+    /** @var ICacheFactory */
+    private $cacheFactory;
+
+    public function __construct(IAppData $appData,
+        IURLGenerator $urlGenerator,
+        ICacheFactory $cacheFactory,
+        SystemConfig $config,
+        LoggerInterface $logger) {
+        $this->appData = $appData;
+        $this->urlGenerator = $urlGenerator;
+        $this->cacheFactory = $cacheFactory;
+        $this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl()));
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param string $root
+     * @param string $file
+     * @param string $app
+     * @return bool
+     */
+    public function process($root, $file, $app) {
+        if ($this->config->getValue('debug') || !$this->config->getValue('installed')) {
+            return false;
+        }
+
+        $path = explode('/', $root . '/' . $file);
+
+        $fileName = array_pop($path);
+        $path = implode('/', $path);
+
+        try {
+            $folder = $this->appData->getFolder($app);
+        } catch (NotFoundException $e) {
+            // creating css appdata folder
+            $folder = $this->appData->newFolder($app);
+        }
+
+        if ($this->isCached($fileName, $folder)) {
+            return true;
+        }
+        return $this->cache($path, $fileName, $folder);
+    }
+
+    /**
+     * @param string $fileName
+     * @param ISimpleFolder $folder
+     * @return bool
+     */
+    protected function isCached($fileName, ISimpleFolder $folder) {
+        $fileName = str_replace('.json', '.js', $fileName);
+
+        if (!$folder->fileExists($fileName)) {
+            return false;
+        }
+
+        $fileName = $fileName . '.deps';
+        try {
+            $deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
+            $fromCache = true;
+            if ($deps === null || $deps === '') {
+                $fromCache = false;
+                $depFile = $folder->getFile($fileName);
+                $deps = $depFile->getContent();
+            }
+
+            // check again
+            if ($deps === null || $deps === '') {
+                $this->logger->info('JSCombiner: deps file empty: ' . $fileName);
+                return false;
+            }
+
+            $deps = json_decode($deps, true);
+
+            if ($deps === null) {
+                return false;
+            }
+
+            foreach ($deps as $file => $mtime) {
+                if (!file_exists($file) || filemtime($file) > $mtime) {
+                    return false;
+                }
+            }
+
+            if ($fromCache === false) {
+                $this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps));
+            }
+
+            return true;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param string $fileName
+     * @param ISimpleFolder $folder
+     * @return bool
+     */
+    protected function cache($path, $fileName, ISimpleFolder $folder) {
+        $deps = [];
+        $fullPath = $path . '/' . $fileName;
+        $data = json_decode(file_get_contents($fullPath));
+        $deps[$fullPath] = filemtime($fullPath);
+
+        $res = '';
+        foreach ($data as $file) {
+            $filePath = $path . '/' . $file;
+
+            if (is_file($filePath)) {
+                $res .= file_get_contents($filePath);
+                $res .= PHP_EOL . PHP_EOL;
+                $deps[$filePath] = filemtime($filePath);
+            }
+        }
+
+        $fileName = str_replace('.json', '.js', $fileName);
+        try {
+            $cachedfile = $folder->getFile($fileName);
+        } catch (NotFoundException $e) {
+            $cachedfile = $folder->newFile($fileName);
+        }
+
+        $depFileName = $fileName . '.deps';
+        try {
+            $depFile = $folder->getFile($depFileName);
+        } catch (NotFoundException $e) {
+            $depFile = $folder->newFile($depFileName);
+        }
+
+        try {
+            $gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+        } catch (NotFoundException $e) {
+            $gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
+        }
+
+        try {
+            $cachedfile->putContent($res);
+            $deps = json_encode($deps);
+            $depFile->putContent($deps);
+            $this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+            $gzipFile->putContent(gzencode($res, 9));
+            $this->logger->debug('JSCombiner: successfully cached: ' . $fileName);
+            return true;
+        } catch (NotPermittedException|NotFoundException $e) {
+            $this->logger->error('JSCombiner: unable to cache: ' . $fileName);
+            return false;
+        }
+    }
+
+    /**
+     * @param string $appName
+     * @param string $fileName
+     * @return string
+     */
+    public function getCachedJS($appName, $fileName) {
+        $tmpfileLoc = explode('/', $fileName);
+        $fileName = array_pop($tmpfileLoc);
+        $fileName = str_replace('.json', '.js', $fileName);
+
+        return substr($this->urlGenerator->linkToRoute('core.Js.getJs', ['fileName' => $fileName, 'appName' => $appName]), strlen(\OC::$WEBROOT) + 1);
+    }
+
+    /**
+     * @param string $root
+     * @param string $file
+     * @return string[]
+     */
+    public function getContent($root, $file) {
+        /** @var array $data */
+        $data = json_decode(file_get_contents($root . '/' . $file));
+        if (!is_array($data)) {
+            return [];
+        }
+
+        $path = explode('/', $file);
+        array_pop($path);
+        $path = implode('/', $path);
+
+        $result = [];
+        foreach ($data as $f) {
+            $result[] = $path . '/' . $f;
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Clear cache with combined javascript files
+     *
+     * @throws NotFoundException
+     */
+    public function resetCache() {
+        $this->cacheFactory->createDistributed('JS-')->clear();
+        $appDirectory = $this->appData->getDirectoryListing();
+        foreach ($appDirectory as $folder) {
+            foreach ($folder->getDirectoryListing() as $file) {
+                $file->delete();
+            }
+        }
+    }
 }

lib/private/Files/Cache/Wrapper/CacheJail.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 		if ($path === '') {
 			return $this->getRoot();
 		} else {
-			return $this->getRoot() . '/' . ltrim($path, '/');
+			return $this->getRoot().'/'.ltrim($path, '/');
 		}
 	}
 
@@ -98,7 +98,7 @@ 
 		$rootLength = strlen($root) + 1;
 		if ($path === $root) {
 			return '';
-		} elseif (substr($path, 0, $rootLength) === $root . '/') {
+		} elseif (substr($path, 0, $rootLength) === $root.'/') {
 			return substr($path, $rootLength);
 		} else {
 			return null;
@@ -317,7 +317,7 @@ 
 					new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR,
 						[
 							new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'path', $this->getGetUnjailedRoot()),
-							new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()) . '/%'),
+							new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()).'/%'),
 						],
 					)
 				]

Indentation +304 added lines, -304 removed lines

@@ -22,308 +22,308 @@
  */
 class CacheJail extends CacheWrapper {
 
-	protected string $unjailedRoot;
-
-	public function __construct(
-		?ICache $cache,
-		protected string $root,
-		?CacheDependencies $dependencies = null,
-	) {
-		parent::__construct($cache, $dependencies);
-
-		$this->unjailedRoot = $root;
-		$parent = $cache;
-		while ($parent instanceof CacheWrapper) {
-			if ($parent instanceof CacheJail) {
-				$this->unjailedRoot = $parent->getSourcePath($this->unjailedRoot);
-			}
-			$parent = $parent->getCache();
-		}
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getRoot() {
-		return $this->root;
-	}
-
-	/**
-	 * Get the root path with any nested jails resolved
-	 *
-	 * @return string
-	 */
-	public function getGetUnjailedRoot() {
-		return $this->unjailedRoot;
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getSourcePath(string $path) {
-		if ($path === '') {
-			return $this->getRoot();
-		} else {
-			return $this->getRoot() . '/' . ltrim($path, '/');
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param null|string $root
-	 * @return null|string the jailed path or null if the path is outside the jail
-	 */
-	protected function getJailedPath(string $path, ?string $root = null) {
-		if ($root === null) {
-			$root = $this->getRoot();
-		}
-		if ($root === '') {
-			return $path;
-		}
-		$rootLength = strlen($root) + 1;
-		if ($path === $root) {
-			return '';
-		} elseif (substr($path, 0, $rootLength) === $root . '/') {
-			return substr($path, $rootLength);
-		} else {
-			return null;
-		}
-	}
-
-	protected function formatCacheEntry($entry) {
-		if (isset($entry['path'])) {
-			$entry['path'] = $this->getJailedPath($entry['path']);
-		}
-		return $entry;
-	}
-
-	/**
-	 * get the stored metadata of a file or folder
-	 *
-	 * @param string|int $file
-	 * @return ICacheEntry|false
-	 */
-	public function get($file) {
-		if (is_string($file) or $file == '') {
-			$file = $this->getSourcePath($file);
-		}
-		return parent::get($file);
-	}
-
-	/**
-	 * insert meta data for a new file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	public function insert($file, array $data) {
-		return $this->getCache()->insert($this->getSourcePath($file), $data);
-	}
-
-	/**
-	 * update the metadata in the cache
-	 *
-	 * @param int $id
-	 * @param array $data
-	 */
-	public function update($id, array $data) {
-		$this->getCache()->update($id, $data);
-	}
-
-	/**
-	 * get the file id for a file
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getId($file) {
-		return $this->getCache()->getId($this->getSourcePath($file));
-	}
-
-	/**
-	 * get the id of the parent folder of a file
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getParentId($file) {
-		return $this->getCache()->getParentId($this->getSourcePath($file));
-	}
-
-	/**
-	 * check if a file is available in the cache
-	 *
-	 * @param string $file
-	 * @return bool
-	 */
-	public function inCache($file) {
-		return $this->getCache()->inCache($this->getSourcePath($file));
-	}
-
-	/**
-	 * remove a file or folder from the cache
-	 *
-	 * @param string $file
-	 */
-	public function remove($file) {
-		$this->getCache()->remove($this->getSourcePath($file));
-	}
-
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * @param string $source
-	 * @param string $target
-	 */
-	public function move($source, $target) {
-		$this->getCache()->move($this->getSourcePath($source), $this->getSourcePath($target));
-	}
-
-	/**
-	 * Get the storage id and path needed for a move
-	 *
-	 * @param string $path
-	 * @return array [$storageId, $internalPath]
-	 */
-	protected function getMoveInfo($path) {
-		return [$this->getNumericStorageId(), $this->getSourcePath($path)];
-	}
-
-	/**
-	 * remove all entries for files that are stored on the storage from the cache
-	 */
-	public function clear() {
-		$this->getCache()->remove($this->getRoot());
-	}
-
-	/**
-	 * @param string $file
-	 *
-	 * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
-	 */
-	public function getStatus($file) {
-		return $this->getCache()->getStatus($this->getSourcePath($file));
-	}
-
-	/**
-	 * update the folder size and the size of all parent folders
-	 *
-	 * @param array|ICacheEntry|null $data (optional) meta data of the folder
-	 */
-	public function correctFolderSize(string $path, $data = null, bool $isBackgroundScan = false): void {
-		$cache = $this->getCache();
-		if ($cache instanceof Cache) {
-			$cache->correctFolderSize($this->getSourcePath($path), $data, $isBackgroundScan);
-		}
-	}
-
-	/**
-	 * get the size of a folder and set it in the cache
-	 *
-	 * @param string $path
-	 * @param array|null|ICacheEntry $entry (optional) meta data of the folder
-	 * @return int|float
-	 */
-	public function calculateFolderSize($path, $entry = null) {
-		$cache = $this->getCache();
-		if ($cache instanceof Cache) {
-			return $cache->calculateFolderSize($this->getSourcePath($path), $entry);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * get all file ids on the files on the storage
-	 *
-	 * @return int[]
-	 */
-	public function getAll() {
-		// not supported
-		return [];
-	}
-
-	/**
-	 * find a folder in the cache which has not been fully scanned
-	 *
-	 * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
-	 * use the one with the highest id gives the best result with the background scanner, since that is most
-	 * likely the folder where we stopped scanning previously
-	 *
-	 * @return string|false the path of the folder or false when no folder matched
-	 */
-	public function getIncomplete() {
-		// not supported
-		return false;
-	}
-
-	/**
-	 * get the path of a file on this storage by it's id
-	 *
-	 * @param int $id
-	 * @return string|null
-	 */
-	public function getPathById($id) {
-		$path = $this->getCache()->getPathById($id);
-		if ($path === null) {
-			return null;
-		}
-
-		return $this->getJailedPath($path);
-	}
-
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * Note that this should make sure the entries are removed from the source cache
-	 *
-	 * @param \OCP\Files\Cache\ICache $sourceCache
-	 * @param string $sourcePath
-	 * @param string $targetPath
-	 */
-	public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
-		if ($sourceCache === $this) {
-			return $this->move($sourcePath, $targetPath);
-		}
-		return $this->getCache()->moveFromCache($sourceCache, $sourcePath, $this->getSourcePath($targetPath));
-	}
-
-	public function getQueryFilterForStorage(): ISearchOperator {
-		return $this->addJailFilterQuery($this->getCache()->getQueryFilterForStorage());
-	}
-
-	protected function addJailFilterQuery(ISearchOperator $filter): ISearchOperator {
-		if ($this->getGetUnjailedRoot() !== '' && $this->getGetUnjailedRoot() !== '/') {
-			return new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND,
-				[
-					$filter,
-					new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR,
-						[
-							new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'path', $this->getGetUnjailedRoot()),
-							new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()) . '/%'),
-						],
-					)
-				]
-			);
-		} else {
-			return $filter;
-		}
-	}
-
-	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
-		if ($this->getGetUnjailedRoot() === '' || str_starts_with($rawEntry->getPath(), $this->getGetUnjailedRoot())) {
-			$rawEntry = $this->getCache()->getCacheEntryFromSearchResult($rawEntry);
-			if ($rawEntry) {
-				$jailedPath = $this->getJailedPath($rawEntry->getPath());
-				if ($jailedPath !== null) {
-					return $this->formatCacheEntry(clone $rawEntry) ?: null;
-				}
-			}
-		}
-
-		return null;
-	}
+    protected string $unjailedRoot;
+
+    public function __construct(
+        ?ICache $cache,
+        protected string $root,
+        ?CacheDependencies $dependencies = null,
+    ) {
+        parent::__construct($cache, $dependencies);
+
+        $this->unjailedRoot = $root;
+        $parent = $cache;
+        while ($parent instanceof CacheWrapper) {
+            if ($parent instanceof CacheJail) {
+                $this->unjailedRoot = $parent->getSourcePath($this->unjailedRoot);
+            }
+            $parent = $parent->getCache();
+        }
+    }
+
+    /**
+     * @return string
+     */
+    protected function getRoot() {
+        return $this->root;
+    }
+
+    /**
+     * Get the root path with any nested jails resolved
+     *
+     * @return string
+     */
+    public function getGetUnjailedRoot() {
+        return $this->unjailedRoot;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getSourcePath(string $path) {
+        if ($path === '') {
+            return $this->getRoot();
+        } else {
+            return $this->getRoot() . '/' . ltrim($path, '/');
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param null|string $root
+     * @return null|string the jailed path or null if the path is outside the jail
+     */
+    protected function getJailedPath(string $path, ?string $root = null) {
+        if ($root === null) {
+            $root = $this->getRoot();
+        }
+        if ($root === '') {
+            return $path;
+        }
+        $rootLength = strlen($root) + 1;
+        if ($path === $root) {
+            return '';
+        } elseif (substr($path, 0, $rootLength) === $root . '/') {
+            return substr($path, $rootLength);
+        } else {
+            return null;
+        }
+    }
+
+    protected function formatCacheEntry($entry) {
+        if (isset($entry['path'])) {
+            $entry['path'] = $this->getJailedPath($entry['path']);
+        }
+        return $entry;
+    }
+
+    /**
+     * get the stored metadata of a file or folder
+     *
+     * @param string|int $file
+     * @return ICacheEntry|false
+     */
+    public function get($file) {
+        if (is_string($file) or $file == '') {
+            $file = $this->getSourcePath($file);
+        }
+        return parent::get($file);
+    }
+
+    /**
+     * insert meta data for a new file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    public function insert($file, array $data) {
+        return $this->getCache()->insert($this->getSourcePath($file), $data);
+    }
+
+    /**
+     * update the metadata in the cache
+     *
+     * @param int $id
+     * @param array $data
+     */
+    public function update($id, array $data) {
+        $this->getCache()->update($id, $data);
+    }
+
+    /**
+     * get the file id for a file
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getId($file) {
+        return $this->getCache()->getId($this->getSourcePath($file));
+    }
+
+    /**
+     * get the id of the parent folder of a file
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getParentId($file) {
+        return $this->getCache()->getParentId($this->getSourcePath($file));
+    }
+
+    /**
+     * check if a file is available in the cache
+     *
+     * @param string $file
+     * @return bool
+     */
+    public function inCache($file) {
+        return $this->getCache()->inCache($this->getSourcePath($file));
+    }
+
+    /**
+     * remove a file or folder from the cache
+     *
+     * @param string $file
+     */
+    public function remove($file) {
+        $this->getCache()->remove($this->getSourcePath($file));
+    }
+
+    /**
+     * Move a file or folder in the cache
+     *
+     * @param string $source
+     * @param string $target
+     */
+    public function move($source, $target) {
+        $this->getCache()->move($this->getSourcePath($source), $this->getSourcePath($target));
+    }
+
+    /**
+     * Get the storage id and path needed for a move
+     *
+     * @param string $path
+     * @return array [$storageId, $internalPath]
+     */
+    protected function getMoveInfo($path) {
+        return [$this->getNumericStorageId(), $this->getSourcePath($path)];
+    }
+
+    /**
+     * remove all entries for files that are stored on the storage from the cache
+     */
+    public function clear() {
+        $this->getCache()->remove($this->getRoot());
+    }
+
+    /**
+     * @param string $file
+     *
+     * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
+     */
+    public function getStatus($file) {
+        return $this->getCache()->getStatus($this->getSourcePath($file));
+    }
+
+    /**
+     * update the folder size and the size of all parent folders
+     *
+     * @param array|ICacheEntry|null $data (optional) meta data of the folder
+     */
+    public function correctFolderSize(string $path, $data = null, bool $isBackgroundScan = false): void {
+        $cache = $this->getCache();
+        if ($cache instanceof Cache) {
+            $cache->correctFolderSize($this->getSourcePath($path), $data, $isBackgroundScan);
+        }
+    }
+
+    /**
+     * get the size of a folder and set it in the cache
+     *
+     * @param string $path
+     * @param array|null|ICacheEntry $entry (optional) meta data of the folder
+     * @return int|float
+     */
+    public function calculateFolderSize($path, $entry = null) {
+        $cache = $this->getCache();
+        if ($cache instanceof Cache) {
+            return $cache->calculateFolderSize($this->getSourcePath($path), $entry);
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * get all file ids on the files on the storage
+     *
+     * @return int[]
+     */
+    public function getAll() {
+        // not supported
+        return [];
+    }
+
+    /**
+     * find a folder in the cache which has not been fully scanned
+     *
+     * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
+     * use the one with the highest id gives the best result with the background scanner, since that is most
+     * likely the folder where we stopped scanning previously
+     *
+     * @return string|false the path of the folder or false when no folder matched
+     */
+    public function getIncomplete() {
+        // not supported
+        return false;
+    }
+
+    /**
+     * get the path of a file on this storage by it's id
+     *
+     * @param int $id
+     * @return string|null
+     */
+    public function getPathById($id) {
+        $path = $this->getCache()->getPathById($id);
+        if ($path === null) {
+            return null;
+        }
+
+        return $this->getJailedPath($path);
+    }
+
+    /**
+     * Move a file or folder in the cache
+     *
+     * Note that this should make sure the entries are removed from the source cache
+     *
+     * @param \OCP\Files\Cache\ICache $sourceCache
+     * @param string $sourcePath
+     * @param string $targetPath
+     */
+    public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
+        if ($sourceCache === $this) {
+            return $this->move($sourcePath, $targetPath);
+        }
+        return $this->getCache()->moveFromCache($sourceCache, $sourcePath, $this->getSourcePath($targetPath));
+    }
+
+    public function getQueryFilterForStorage(): ISearchOperator {
+        return $this->addJailFilterQuery($this->getCache()->getQueryFilterForStorage());
+    }
+
+    protected function addJailFilterQuery(ISearchOperator $filter): ISearchOperator {
+        if ($this->getGetUnjailedRoot() !== '' && $this->getGetUnjailedRoot() !== '/') {
+            return new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND,
+                [
+                    $filter,
+                    new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR,
+                        [
+                            new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'path', $this->getGetUnjailedRoot()),
+                            new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()) . '/%'),
+                        ],
+                    )
+                ]
+            );
+        } else {
+            return $filter;
+        }
+    }
+
+    public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
+        if ($this->getGetUnjailedRoot() === '' || str_starts_with($rawEntry->getPath(), $this->getGetUnjailedRoot())) {
+            $rawEntry = $this->getCache()->getCacheEntryFromSearchResult($rawEntry);
+            if ($rawEntry) {
+                $jailedPath = $this->getJailedPath($rawEntry->getPath());
+                if ($jailedPath !== null) {
+                    return $this->formatCacheEntry(clone $rawEntry) ?: null;
+                }
+            }
+        }
+
+        return null;
+    }
 }

lib/public/Log/IWriter.php

Indentation +8 added lines, -8 removed lines

@@ -28,12 +28,12 @@
  * @since 14.0.0
  */
 interface IWriter {
-	/**
-	 * @since 14.0.0
-	 *
-	 * @param string $app
-	 * @param string|array $message
-	 * @param int $level
-	 */
-	public function write(string $app, $message, int $level);
+    /**
+     * @since 14.0.0
+     *
+     * @param string $app
+     * @param string|array $message
+     * @param int $level
+     */
+    public function write(string $app, $message, int $level);
 }