nextcloud / server

apps/oauth2/lib/Controller/LoginRedirectorController.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 
 		if ($response_type !== 'code') {
 			//Fail
-			$url = $client->getRedirectUri() . '?error=unsupported_response_type&state=' . $state;
+			$url = $client->getRedirectUri().'?error=unsupported_response_type&state='.$state;
 			return new RedirectResponse($url);
 		}
 

Indentation +63 added lines, -63 removed lines

@@ -39,72 +39,72 @@
 use OCP\IURLGenerator;
 
 class LoginRedirectorController extends Controller {
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var ClientMapper */
-	private $clientMapper;
-	/** @var ISession */
-	private $session;
-	/** @var IL10N */
-	private $l;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var ClientMapper */
+    private $clientMapper;
+    /** @var ISession */
+    private $session;
+    /** @var IL10N */
+    private $l;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IURLGenerator $urlGenerator
-	 * @param ClientMapper $clientMapper
-	 * @param ISession $session
-	 * @param IL10N $l
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IURLGenerator $urlGenerator,
-								ClientMapper $clientMapper,
-								ISession $session,
-								IL10N $l) {
-		parent::__construct($appName, $request);
-		$this->urlGenerator = $urlGenerator;
-		$this->clientMapper = $clientMapper;
-		$this->session = $session;
-		$this->l = $l;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IURLGenerator $urlGenerator
+     * @param ClientMapper $clientMapper
+     * @param ISession $session
+     * @param IL10N $l
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IURLGenerator $urlGenerator,
+                                ClientMapper $clientMapper,
+                                ISession $session,
+                                IL10N $l) {
+        parent::__construct($appName, $request);
+        $this->urlGenerator = $urlGenerator;
+        $this->clientMapper = $clientMapper;
+        $this->session = $session;
+        $this->l = $l;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @param string $client_id
-	 * @param string $state
-	 * @param string $response_type
-	 * @return Response
-	 */
-	public function authorize($client_id,
-							  $state,
-							  $response_type): Response {
-		try {
-			$client = $this->clientMapper->getByIdentifier($client_id);
-		} catch (ClientNotFoundException $e) {
-			$params = [
-				'content' => $this->l->t('Your client is not authorized to connect. Please inform the administrator of your client.'),
-			];
-			return new TemplateResponse('core', '404', $params, 'guest');
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @param string $client_id
+     * @param string $state
+     * @param string $response_type
+     * @return Response
+     */
+    public function authorize($client_id,
+                                $state,
+                                $response_type): Response {
+        try {
+            $client = $this->clientMapper->getByIdentifier($client_id);
+        } catch (ClientNotFoundException $e) {
+            $params = [
+                'content' => $this->l->t('Your client is not authorized to connect. Please inform the administrator of your client.'),
+            ];
+            return new TemplateResponse('core', '404', $params, 'guest');
+        }
 
-		if ($response_type !== 'code') {
-			//Fail
-			$url = $client->getRedirectUri() . '?error=unsupported_response_type&state=' . $state;
-			return new RedirectResponse($url);
-		}
+        if ($response_type !== 'code') {
+            //Fail
+            $url = $client->getRedirectUri() . '?error=unsupported_response_type&state=' . $state;
+            return new RedirectResponse($url);
+        }
 
-		$this->session->set('oauth.state', $state);
+        $this->session->set('oauth.state', $state);
 
-		$targetUrl = $this->urlGenerator->linkToRouteAbsolute(
-			'core.ClientFlowLogin.showAuthPickerPage',
-			[
-				'clientIdentifier' => $client->getClientIdentifier(),
-			]
-		);
-		return new RedirectResponse($targetUrl);
-	}
+        $targetUrl = $this->urlGenerator->linkToRouteAbsolute(
+            'core.ClientFlowLogin.showAuthPickerPage',
+            [
+                'clientIdentifier' => $client->getClientIdentifier(),
+            ]
+        );
+        return new RedirectResponse($targetUrl);
+    }
 }

apps/files_external/lib/Lib/Auth/SMB/KerberosAuth.php

Indentation +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@
 use OCP\IL10N;
 
 class KerberosAuth extends AuthMechanism {
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('smb::kerberos')
-			->setScheme(self::SCHEME_SMB)
-			->setText($l->t('Kerberos ticket'));
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('smb::kerberos')
+            ->setScheme(self::SCHEME_SMB)
+            ->setText($l->t('Kerberos ticket'));
+    }
 }

lib/private/Authentication/Token/PublicKeyTokenMapper.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 		$data = $result->fetchAll();
 		$result->closeCursor();
 
-		$entities = array_map(function ($row) {
+		$entities = array_map(function($row) {
 			return PublicKeyToken::fromRow($row);
 		}, $data);
 

Indentation +199 added lines, -199 removed lines

@@ -36,224 +36,224 @@
  * @template-extends QBMapper<PublicKeyToken>
  */
 class PublicKeyTokenMapper extends QBMapper {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'authtoken');
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'authtoken');
+    }
 
-	/**
-	 * Invalidate (delete) a given token
-	 *
-	 * @param string $token
-	 */
-	public function invalidate(string $token) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-	}
+    /**
+     * Invalidate (delete) a given token
+     *
+     * @param string $token
+     */
+    public function invalidate(string $token) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+    }
 
-	/**
-	 * @param int $olderThan
-	 * @param int $remember
-	 */
-	public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REMEMBER) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->lt('last_activity', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-	}
+    /**
+     * @param int $olderThan
+     * @param int $remember
+     */
+    public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REMEMBER) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->lt('last_activity', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+    }
 
-	/**
-	 * Get the user UID for the given token
-	 *
-	 * @throws DoesNotExistException
-	 */
-	public function getToken(string $token): PublicKeyToken {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
+    /**
+     * Get the user UID for the given token
+     *
+     * @throws DoesNotExistException
+     */
+    public function getToken(string $token): PublicKeyToken {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
 
-		$data = $result->fetch();
-		$result->closeCursor();
-		if ($data === false) {
-			throw new DoesNotExistException('token does not exist');
-		}
-		return PublicKeyToken::fromRow($data);
-	}
+        $data = $result->fetch();
+        $result->closeCursor();
+        if ($data === false) {
+            throw new DoesNotExistException('token does not exist');
+        }
+        return PublicKeyToken::fromRow($data);
+    }
 
-	/**
-	 * Get the token for $id
-	 *
-	 * @throws DoesNotExistException
-	 */
-	public function getTokenById(int $id): PublicKeyToken {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
+    /**
+     * Get the token for $id
+     *
+     * @throws DoesNotExistException
+     */
+    public function getTokenById(int $id): PublicKeyToken {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
 
-		$data = $result->fetch();
-		$result->closeCursor();
-		if ($data === false) {
-			throw new DoesNotExistException('token does not exist');
-		}
-		return PublicKeyToken::fromRow($data);
-	}
+        $data = $result->fetch();
+        $result->closeCursor();
+        if ($data === false) {
+            throw new DoesNotExistException('token does not exist');
+        }
+        return PublicKeyToken::fromRow($data);
+    }
 
-	/**
-	 * Get all tokens of a user
-	 *
-	 * The provider may limit the number of result rows in case of an abuse
-	 * where a high number of (session) tokens is generated
-	 *
-	 * @param string $uid
-	 * @return PublicKeyToken[]
-	 */
-	public function getTokenByUser(string $uid): array {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->setMaxResults(1000);
-		$result = $qb->execute();
-		$data = $result->fetchAll();
-		$result->closeCursor();
+    /**
+     * Get all tokens of a user
+     *
+     * The provider may limit the number of result rows in case of an abuse
+     * where a high number of (session) tokens is generated
+     *
+     * @param string $uid
+     * @return PublicKeyToken[]
+     */
+    public function getTokenByUser(string $uid): array {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->setMaxResults(1000);
+        $result = $qb->execute();
+        $data = $result->fetchAll();
+        $result->closeCursor();
 
-		$entities = array_map(function ($row) {
-			return PublicKeyToken::fromRow($row);
-		}, $data);
+        $entities = array_map(function ($row) {
+            return PublicKeyToken::fromRow($row);
+        }, $data);
 
-		return $entities;
-	}
+        return $entities;
+    }
 
-	public function deleteById(string $uid, int $id) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
-	}
+    public function deleteById(string $uid, int $id) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
+        $qb->execute();
+    }
 
-	/**
-	 * delete all auth token which belong to a specific client if the client was deleted
-	 *
-	 * @param string $name
-	 */
-	public function deleteByName(string $name) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
-	}
+    /**
+     * delete all auth token which belong to a specific client if the client was deleted
+     *
+     * @param string $name
+     */
+    public function deleteByName(string $name) {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
+        $qb->execute();
+    }
 
-	public function deleteTempToken(PublicKeyToken $except) {
-		$qb = $this->db->getQueryBuilder();
+    public function deleteTempToken(PublicKeyToken $except) {
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->delete($this->tableName)
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($except->getUID())))
-			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN)))
-			->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($except->getId())))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($except->getUID())))
+            ->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN)))
+            ->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($except->getId())))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
 
-		$qb->execute();
-	}
+        $qb->execute();
+    }
 
-	public function hasExpiredTokens(string $uid): bool {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->andWhere($qb->expr()->eq('password_invalid', $qb->createNamedParameter(true), IQueryBuilder::PARAM_BOOL))
-			->setMaxResults(1);
+    public function hasExpiredTokens(string $uid): bool {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->andWhere($qb->expr()->eq('password_invalid', $qb->createNamedParameter(true), IQueryBuilder::PARAM_BOOL))
+            ->setMaxResults(1);
 
-		$cursor = $qb->execute();
-		$data = $cursor->fetchAll();
-		$cursor->closeCursor();
+        $cursor = $qb->execute();
+        $data = $cursor->fetchAll();
+        $cursor->closeCursor();
 
-		return count($data) === 1;
-	}
+        return count($data) === 1;
+    }
 
-	/**
-	 * Update the last activity timestamp
-	 *
-	 * In highly concurrent setups it can happen that two parallel processes
-	 * trigger the update at (nearly) the same time. In that special case it's
-	 * not necessary to hit the database with two actual updates. Therefore the
-	 * target last activity is included in the WHERE clause with a few seconds
-	 * of tolerance.
-	 *
-	 * Example:
-	 * - process 1 (P1) reads the token at timestamp 1500
-	 * - process 1 (P2) reads the token at timestamp 1501
-	 * - activity update interval is 100
-	 *
-	 * This means
-	 *
-	 * - P1 will see a last_activity smaller than the current time and update
-	 *   the token row
-	 * - If P2 reads after P1 had written, it will see 1600 as last activity
-	 *   and the comparison on last_activity won't be truthy. This means no rows
-	 *   need to be updated a second time
-	 * - If P2 reads before P1 had written, it will see 1501 as last activity,
-	 *   but the comparison on last_activity will still not be truthy and the
-	 *   token row is not updated a second time
-	 *
-	 * @param IToken $token
-	 * @param int $now
-	 */
-	public function updateActivity(IToken $token, int $now): void {
-		$qb = $this->db->getQueryBuilder();
-		$update = $qb->update($this->getTableName())
-			->set('last_activity', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($token->getId(), IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
-				$qb->expr()->lt('last_activity', $qb->createNamedParameter($now - 15, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT)
-			);
-		$update->executeStatement();
-	}
+    /**
+     * Update the last activity timestamp
+     *
+     * In highly concurrent setups it can happen that two parallel processes
+     * trigger the update at (nearly) the same time. In that special case it's
+     * not necessary to hit the database with two actual updates. Therefore the
+     * target last activity is included in the WHERE clause with a few seconds
+     * of tolerance.
+     *
+     * Example:
+     * - process 1 (P1) reads the token at timestamp 1500
+     * - process 1 (P2) reads the token at timestamp 1501
+     * - activity update interval is 100
+     *
+     * This means
+     *
+     * - P1 will see a last_activity smaller than the current time and update
+     *   the token row
+     * - If P2 reads after P1 had written, it will see 1600 as last activity
+     *   and the comparison on last_activity won't be truthy. This means no rows
+     *   need to be updated a second time
+     * - If P2 reads before P1 had written, it will see 1501 as last activity,
+     *   but the comparison on last_activity will still not be truthy and the
+     *   token row is not updated a second time
+     *
+     * @param IToken $token
+     * @param int $now
+     */
+    public function updateActivity(IToken $token, int $now): void {
+        $qb = $this->db->getQueryBuilder();
+        $update = $qb->update($this->getTableName())
+            ->set('last_activity', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
+            ->where(
+                $qb->expr()->eq('id', $qb->createNamedParameter($token->getId(), IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
+                $qb->expr()->lt('last_activity', $qb->createNamedParameter($now - 15, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT)
+            );
+        $update->executeStatement();
+    }
 
-	public function updateHashesForUser(string $userId, string $passwordHash): void {
-		$qb = $this->db->getQueryBuilder();
-		$update = $qb->update($this->getTableName())
-			->set('password_hash', $qb->createNamedParameter($passwordHash))
-			->where(
-				$qb->expr()->eq('uid', $qb->createNamedParameter($userId))
-			);
-		$update->executeStatement();
-	}
+    public function updateHashesForUser(string $userId, string $passwordHash): void {
+        $qb = $this->db->getQueryBuilder();
+        $update = $qb->update($this->getTableName())
+            ->set('password_hash', $qb->createNamedParameter($passwordHash))
+            ->where(
+                $qb->expr()->eq('uid', $qb->createNamedParameter($userId))
+            );
+        $update->executeStatement();
+    }
 
-	public function getFirstTokenForUser(string $userId): ?PublicKeyToken {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($userId)))
-			->setMaxResults(1)
-			->orderBy('id');
-		$result = $qb->executeQuery();
+    public function getFirstTokenForUser(string $userId): ?PublicKeyToken {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($userId)))
+            ->setMaxResults(1)
+            ->orderBy('id');
+        $result = $qb->executeQuery();
 
-		$data = $result->fetch();
-		$result->closeCursor();
-		if ($data === false) {
-			return null;
-		}
-		return PublicKeyToken::fromRow($data);
-	}
+        $data = $result->fetch();
+        $result->closeCursor();
+        if ($data === false) {
+            return null;
+        }
+        return PublicKeyToken::fromRow($data);
+    }
 }

lib/public/Federation/Exceptions/BadRequestException.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 		$l = \OC::$server->getL10N('federation');
 		$this->parameterList = $missingParameters;
 		$parameterList = implode(',', $missingParameters);
-		$message = 'Parameters missing in order to complete the request. Missing Parameters: ' . $parameterList;
+		$message = 'Parameters missing in order to complete the request. Missing Parameters: '.$parameterList;
 		$hint = $l->t('Parameters missing in order to complete the request. Missing Parameters: "%s"', [$parameterList]);
 		parent::__construct($message, $hint);
 	}

Indentation +40 added lines, -40 removed lines

@@ -32,48 +32,48 @@
  * @since 14.0.0
  */
 class BadRequestException extends HintException {
-	/**
-	 * @var string[] $parameterList
-	 */
-	private $parameterList;
+    /**
+     * @var string[] $parameterList
+     */
+    private $parameterList;
 
-	/**
-	 * BadRequestException constructor.
-	 *
-	 * @since 14.0.0
-	 *
-	 * @param array $missingParameters
-	 */
-	public function __construct(array $missingParameters) {
-		$l = \OC::$server->getL10N('federation');
-		$this->parameterList = $missingParameters;
-		$parameterList = implode(',', $missingParameters);
-		$message = 'Parameters missing in order to complete the request. Missing Parameters: ' . $parameterList;
-		$hint = $l->t('Parameters missing in order to complete the request. Missing Parameters: "%s"', [$parameterList]);
-		parent::__construct($message, $hint);
-	}
+    /**
+     * BadRequestException constructor.
+     *
+     * @since 14.0.0
+     *
+     * @param array $missingParameters
+     */
+    public function __construct(array $missingParameters) {
+        $l = \OC::$server->getL10N('federation');
+        $this->parameterList = $missingParameters;
+        $parameterList = implode(',', $missingParameters);
+        $message = 'Parameters missing in order to complete the request. Missing Parameters: ' . $parameterList;
+        $hint = $l->t('Parameters missing in order to complete the request. Missing Parameters: "%s"', [$parameterList]);
+        parent::__construct($message, $hint);
+    }
 
-	/**
-	 * get array with the return message as defined in the OCM API
-	 *
-	 * @since 14.0.0
-	 *
-	 * @return array{message: string, validationErrors: array{message: string, name: string}[]}
-	 */
-	public function getReturnMessage() {
-		$result = [
-			'message' => 'RESOURCE_NOT_FOUND',
-			'validationErrors' => [
-			]
-		];
+    /**
+     * get array with the return message as defined in the OCM API
+     *
+     * @since 14.0.0
+     *
+     * @return array{message: string, validationErrors: array{message: string, name: string}[]}
+     */
+    public function getReturnMessage() {
+        $result = [
+            'message' => 'RESOURCE_NOT_FOUND',
+            'validationErrors' => [
+            ]
+        ];
 
-		foreach ($this->parameterList as $missingParameter) {
-			$result['validationErrors'][] = [
-				'name' => $missingParameter,
-				'message' => 'NOT_FOUND'
-			];
-		}
+        foreach ($this->parameterList as $missingParameter) {
+            $result['validationErrors'][] = [
+                'name' => $missingParameter,
+                'message' => 'NOT_FOUND'
+            ];
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 }

lib/private/Files/ObjectStore/Azure.php

Spacing +3 added lines, -3 removed lines

@@ -59,9 +59,9 @@ 
 	private function getBlobClient() {
 		if (!$this->blobClient) {
 			$protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
-			$connectionString = "DefaultEndpointsProtocol=" . $protocol . ";AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
+			$connectionString = "DefaultEndpointsProtocol=".$protocol.";AccountName=".$this->accountName.";AccountKey=".$this->accountKey;
 			if ($this->endpoint) {
-				$connectionString .= ';BlobEndpoint=' . $this->endpoint;
+				$connectionString .= ';BlobEndpoint='.$this->endpoint;
 			}
 			$this->blobClient = BlobRestProxy::createBlobService($connectionString);
 
@@ -76,7 +76,7 @@ 
 	 * @return string the container or bucket name where objects are stored
 	 */
 	public function getStorageId() {
-		return 'azure::blob::' . $this->containerName;
+		return 'azure::blob::'.$this->containerName;
 	}
 
 	/**

Indentation +96 added lines, -96 removed lines

@@ -29,109 +29,109 @@
 use OCP\Files\ObjectStore\IObjectStore;
 
 class Azure implements IObjectStore {
-	/** @var string */
-	private $containerName;
-	/** @var string */
-	private $accountName;
-	/** @var string */
-	private $accountKey;
-	/** @var BlobRestProxy|null */
-	private $blobClient = null;
-	/** @var string|null */
-	private $endpoint = null;
-	/** @var bool  */
-	private $autoCreate = false;
+    /** @var string */
+    private $containerName;
+    /** @var string */
+    private $accountName;
+    /** @var string */
+    private $accountKey;
+    /** @var BlobRestProxy|null */
+    private $blobClient = null;
+    /** @var string|null */
+    private $endpoint = null;
+    /** @var bool  */
+    private $autoCreate = false;
 
-	/**
-	 * @param array $parameters
-	 */
-	public function __construct($parameters) {
-		$this->containerName = $parameters['container'];
-		$this->accountName = $parameters['account_name'];
-		$this->accountKey = $parameters['account_key'];
-		if (isset($parameters['endpoint'])) {
-			$this->endpoint = $parameters['endpoint'];
-		}
-		if (isset($parameters['autocreate'])) {
-			$this->autoCreate = $parameters['autocreate'];
-		}
-	}
+    /**
+     * @param array $parameters
+     */
+    public function __construct($parameters) {
+        $this->containerName = $parameters['container'];
+        $this->accountName = $parameters['account_name'];
+        $this->accountKey = $parameters['account_key'];
+        if (isset($parameters['endpoint'])) {
+            $this->endpoint = $parameters['endpoint'];
+        }
+        if (isset($parameters['autocreate'])) {
+            $this->autoCreate = $parameters['autocreate'];
+        }
+    }
 
-	/**
-	 * @return BlobRestProxy
-	 */
-	private function getBlobClient() {
-		if (!$this->blobClient) {
-			$protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
-			$connectionString = "DefaultEndpointsProtocol=" . $protocol . ";AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
-			if ($this->endpoint) {
-				$connectionString .= ';BlobEndpoint=' . $this->endpoint;
-			}
-			$this->blobClient = BlobRestProxy::createBlobService($connectionString);
+    /**
+     * @return BlobRestProxy
+     */
+    private function getBlobClient() {
+        if (!$this->blobClient) {
+            $protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
+            $connectionString = "DefaultEndpointsProtocol=" . $protocol . ";AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
+            if ($this->endpoint) {
+                $connectionString .= ';BlobEndpoint=' . $this->endpoint;
+            }
+            $this->blobClient = BlobRestProxy::createBlobService($connectionString);
 
-			if ($this->autoCreate) {
-				try {
-					$this->blobClient->createContainer($this->containerName);
-				} catch (ServiceException $e) {
-					if ($e->getCode() === 409) {
-						// already exists
-					} else {
-						throw $e;
-					}
-				}
-			}
-		}
-		return $this->blobClient;
-	}
+            if ($this->autoCreate) {
+                try {
+                    $this->blobClient->createContainer($this->containerName);
+                } catch (ServiceException $e) {
+                    if ($e->getCode() === 409) {
+                        // already exists
+                    } else {
+                        throw $e;
+                    }
+                }
+            }
+        }
+        return $this->blobClient;
+    }
 
-	/**
-	 * @return string the container or bucket name where objects are stored
-	 */
-	public function getStorageId() {
-		return 'azure::blob::' . $this->containerName;
-	}
+    /**
+     * @return string the container or bucket name where objects are stored
+     */
+    public function getStorageId() {
+        return 'azure::blob::' . $this->containerName;
+    }
 
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return resource stream with the read data
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	public function readObject($urn) {
-		$blob = $this->getBlobClient()->getBlob($this->containerName, $urn);
-		return $blob->getContentStream();
-	}
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return resource stream with the read data
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    public function readObject($urn) {
+        $blob = $this->getBlobClient()->getBlob($this->containerName, $urn);
+        return $blob->getContentStream();
+    }
 
-	public function writeObject($urn, $stream, string $mimetype = null) {
-		$options = new CreateBlockBlobOptions();
-		if ($mimetype) {
-			$options->setContentType($mimetype);
-		}
-		$this->getBlobClient()->createBlockBlob($this->containerName, $urn, $stream, $options);
-	}
+    public function writeObject($urn, $stream, string $mimetype = null) {
+        $options = new CreateBlockBlobOptions();
+        if ($mimetype) {
+            $options->setContentType($mimetype);
+        }
+        $this->getBlobClient()->createBlockBlob($this->containerName, $urn, $stream, $options);
+    }
 
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return void
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	public function deleteObject($urn) {
-		$this->getBlobClient()->deleteBlob($this->containerName, $urn);
-	}
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return void
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    public function deleteObject($urn) {
+        $this->getBlobClient()->deleteBlob($this->containerName, $urn);
+    }
 
-	public function objectExists($urn) {
-		try {
-			$this->getBlobClient()->getBlobMetadata($this->containerName, $urn);
-			return true;
-		} catch (ServiceException $e) {
-			if ($e->getCode() === 404) {
-				return false;
-			} else {
-				throw $e;
-			}
-		}
-	}
+    public function objectExists($urn) {
+        try {
+            $this->getBlobClient()->getBlobMetadata($this->containerName, $urn);
+            return true;
+        } catch (ServiceException $e) {
+            if ($e->getCode() === 404) {
+                return false;
+            } else {
+                throw $e;
+            }
+        }
+    }
 
-	public function copyObject($from, $to) {
-		$this->getBlobClient()->copyBlob($this->containerName, $to, $this->containerName, $from);
-	}
+    public function copyObject($from, $to) {
+        $this->getBlobClient()->copyBlob($this->containerName, $to, $this->containerName, $from);
+    }
 }

lib/private/Authentication/Token/PublicKeyToken.php

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
 		if (is_array($scope)) {
 			parent::setScope(json_encode($scope));
 		} else {
-			parent::setScope((string)$scope);
+			parent::setScope((string) $scope);
 		}
 	}
 

Indentation +188 added lines, -188 removed lines

@@ -49,192 +49,192 @@
  * @method setPasswordHash(string $hash)
  */
 class PublicKeyToken extends Entity implements INamedToken, IWipeableToken {
-	public const VERSION = 2;
-
-	/** @var string user UID */
-	protected $uid;
-
-	/** @var string login name used for generating the token */
-	protected $loginName;
-
-	/** @var string encrypted user password */
-	protected $password;
-
-	/** @var string hashed user password */
-	protected $passwordHash;
-
-	/** @var string token name (e.g. browser/OS) */
-	protected $name;
-
-	/** @var string */
-	protected $token;
-
-	/** @var int */
-	protected $type;
-
-	/** @var int */
-	protected $remember;
-
-	/** @var int */
-	protected $lastActivity;
-
-	/** @var int */
-	protected $lastCheck;
-
-	/** @var string */
-	protected $scope;
-
-	/** @var int */
-	protected $expires;
-
-	/** @var string */
-	protected $privateKey;
-
-	/** @var string */
-	protected $publicKey;
-
-	/** @var int */
-	protected $version;
-
-	/** @var bool */
-	protected $passwordInvalid;
-
-	public function __construct() {
-		$this->addType('uid', 'string');
-		$this->addType('loginName', 'string');
-		$this->addType('password', 'string');
-		$this->addType('passwordHash', 'string');
-		$this->addType('name', 'string');
-		$this->addType('token', 'string');
-		$this->addType('type', 'int');
-		$this->addType('remember', 'int');
-		$this->addType('lastActivity', 'int');
-		$this->addType('lastCheck', 'int');
-		$this->addType('scope', 'string');
-		$this->addType('expires', 'int');
-		$this->addType('publicKey', 'string');
-		$this->addType('privateKey', 'string');
-		$this->addType('version', 'int');
-		$this->addType('passwordInvalid', 'bool');
-	}
-
-	public function getId(): int {
-		return $this->id;
-	}
-
-	public function getUID(): string {
-		return $this->uid;
-	}
-
-	/**
-	 * Get the login name used when generating the token
-	 *
-	 * @return string
-	 */
-	public function getLoginName(): string {
-		return parent::getLoginName();
-	}
-
-	/**
-	 * Get the (encrypted) login password
-	 *
-	 * @return string|null
-	 */
-	public function getPassword() {
-		return parent::getPassword();
-	}
-
-	public function jsonSerialize(): array {
-		return [
-			'id' => $this->id,
-			'name' => $this->name,
-			'lastActivity' => $this->lastActivity,
-			'type' => $this->type,
-			'scope' => $this->getScopeAsArray()
-		];
-	}
-
-	/**
-	 * Get the timestamp of the last password check
-	 *
-	 * @return int
-	 */
-	public function getLastCheck(): int {
-		return parent::getLastCheck();
-	}
-
-	/**
-	 * Get the timestamp of the last password check
-	 *
-	 * @param int $time
-	 */
-	public function setLastCheck(int $time) {
-		parent::setLastCheck($time);
-	}
-
-	public function getScope(): string {
-		$scope = parent::getScope();
-		if ($scope === null) {
-			return '';
-		}
-
-		return $scope;
-	}
-
-	public function getScopeAsArray(): array {
-		$scope = json_decode($this->getScope(), true);
-		if (!$scope) {
-			return [
-				'filesystem' => true
-			];
-		}
-		return $scope;
-	}
-
-	public function setScope($scope) {
-		if (is_array($scope)) {
-			parent::setScope(json_encode($scope));
-		} else {
-			parent::setScope((string)$scope);
-		}
-	}
-
-	public function getName(): string {
-		return parent::getName();
-	}
-
-	public function setName(string $name): void {
-		parent::setName($name);
-	}
-
-	public function getRemember(): int {
-		return parent::getRemember();
-	}
-
-	public function setToken(string $token) {
-		parent::setToken($token);
-	}
-
-	public function setPassword(string $password = null) {
-		parent::setPassword($password);
-	}
-
-	public function setExpires($expires) {
-		parent::setExpires($expires);
-	}
-
-	/**
-	 * @return int|null
-	 */
-	public function getExpires() {
-		return parent::getExpires();
-	}
-
-	public function setPasswordInvalid(bool $invalid) {
-		parent::setPasswordInvalid($invalid);
-	}
-
-	public function wipe(): void {
-		parent::setType(IToken::WIPE_TOKEN);
-	}
+    public const VERSION = 2;
+
+    /** @var string user UID */
+    protected $uid;
+
+    /** @var string login name used for generating the token */
+    protected $loginName;
+
+    /** @var string encrypted user password */
+    protected $password;
+
+    /** @var string hashed user password */
+    protected $passwordHash;
+
+    /** @var string token name (e.g. browser/OS) */
+    protected $name;
+
+    /** @var string */
+    protected $token;
+
+    /** @var int */
+    protected $type;
+
+    /** @var int */
+    protected $remember;
+
+    /** @var int */
+    protected $lastActivity;
+
+    /** @var int */
+    protected $lastCheck;
+
+    /** @var string */
+    protected $scope;
+
+    /** @var int */
+    protected $expires;
+
+    /** @var string */
+    protected $privateKey;
+
+    /** @var string */
+    protected $publicKey;
+
+    /** @var int */
+    protected $version;
+
+    /** @var bool */
+    protected $passwordInvalid;
+
+    public function __construct() {
+        $this->addType('uid', 'string');
+        $this->addType('loginName', 'string');
+        $this->addType('password', 'string');
+        $this->addType('passwordHash', 'string');
+        $this->addType('name', 'string');
+        $this->addType('token', 'string');
+        $this->addType('type', 'int');
+        $this->addType('remember', 'int');
+        $this->addType('lastActivity', 'int');
+        $this->addType('lastCheck', 'int');
+        $this->addType('scope', 'string');
+        $this->addType('expires', 'int');
+        $this->addType('publicKey', 'string');
+        $this->addType('privateKey', 'string');
+        $this->addType('version', 'int');
+        $this->addType('passwordInvalid', 'bool');
+    }
+
+    public function getId(): int {
+        return $this->id;
+    }
+
+    public function getUID(): string {
+        return $this->uid;
+    }
+
+    /**
+     * Get the login name used when generating the token
+     *
+     * @return string
+     */
+    public function getLoginName(): string {
+        return parent::getLoginName();
+    }
+
+    /**
+     * Get the (encrypted) login password
+     *
+     * @return string|null
+     */
+    public function getPassword() {
+        return parent::getPassword();
+    }
+
+    public function jsonSerialize(): array {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'lastActivity' => $this->lastActivity,
+            'type' => $this->type,
+            'scope' => $this->getScopeAsArray()
+        ];
+    }
+
+    /**
+     * Get the timestamp of the last password check
+     *
+     * @return int
+     */
+    public function getLastCheck(): int {
+        return parent::getLastCheck();
+    }
+
+    /**
+     * Get the timestamp of the last password check
+     *
+     * @param int $time
+     */
+    public function setLastCheck(int $time) {
+        parent::setLastCheck($time);
+    }
+
+    public function getScope(): string {
+        $scope = parent::getScope();
+        if ($scope === null) {
+            return '';
+        }
+
+        return $scope;
+    }
+
+    public function getScopeAsArray(): array {
+        $scope = json_decode($this->getScope(), true);
+        if (!$scope) {
+            return [
+                'filesystem' => true
+            ];
+        }
+        return $scope;
+    }
+
+    public function setScope($scope) {
+        if (is_array($scope)) {
+            parent::setScope(json_encode($scope));
+        } else {
+            parent::setScope((string)$scope);
+        }
+    }
+
+    public function getName(): string {
+        return parent::getName();
+    }
+
+    public function setName(string $name): void {
+        parent::setName($name);
+    }
+
+    public function getRemember(): int {
+        return parent::getRemember();
+    }
+
+    public function setToken(string $token) {
+        parent::setToken($token);
+    }
+
+    public function setPassword(string $password = null) {
+        parent::setPassword($password);
+    }
+
+    public function setExpires($expires) {
+        parent::setExpires($expires);
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getExpires() {
+        return parent::getExpires();
+    }
+
+    public function setPasswordInvalid(bool $invalid) {
+        parent::setPasswordInvalid($invalid);
+    }
+
+    public function wipe(): void {
+        parent::setType(IToken::WIPE_TOKEN);
+    }
 }

lib/public/IL10N.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 	 * @return string language
 	 * @since 7.0.0
 	 */
-	public function getLanguageCode(): string ;
+	public function getLanguageCode(): string;
 
 	/**
 	 * * The code (en_US, fr_CA, ...) of the locale that is used for this IL10N object

Indentation +68 added lines, -68 removed lines

@@ -43,77 +43,77 @@
  * @since 6.0.0
  */
 interface IL10N {
-	/**
-	 * Translating
-	 * @param string $text The text we need a translation for
-	 * @param array|string $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned.
-	 * @since 6.0.0
-	 */
-	public function t(string $text, $parameters = []): string;
+    /**
+     * Translating
+     * @param string $text The text we need a translation for
+     * @param array|string $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned.
+     * @since 6.0.0
+     */
+    public function t(string $text, $parameters = []): string;
 
-	/**
-	 * Translating
-	 * @param string $text_singular the string to translate for exactly one object
-	 * @param string $text_plural the string to translate for n objects
-	 * @param integer $count Number of objects
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned. %n will be replaced with the number of objects.
-	 *
-	 * The correct plural is determined by the plural_forms-function
-	 * provided by the po file.
-	 * @since 6.0.0
-	 *
-	 */
-	public function n(string $text_singular, string $text_plural, int $count, array $parameters = []): string;
+    /**
+     * Translating
+     * @param string $text_singular the string to translate for exactly one object
+     * @param string $text_plural the string to translate for n objects
+     * @param integer $count Number of objects
+     * @param array $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned. %n will be replaced with the number of objects.
+     *
+     * The correct plural is determined by the plural_forms-function
+     * provided by the po file.
+     * @since 6.0.0
+     *
+     */
+    public function n(string $text_singular, string $text_plural, int $count, array $parameters = []): string;
 
-	/**
-	 * Localization
-	 * @param string $type Type of localization
-	 * @param \DateTime|int|string $data parameters for this localization
-	 * @param array $options currently supports following options:
-	 * 			- 'width': handed into \Punic\Calendar::formatDate as second parameter
-	 * @return string|int|false
-	 *
-	 * Returns the localized data.
-	 *
-	 * Implemented types:
-	 *  - date
-	 *    - Creates a date
-	 *    - l10n-field: date
-	 *    - params: timestamp (int/string)
-	 *  - datetime
-	 *    - Creates date and time
-	 *    - l10n-field: datetime
-	 *    - params: timestamp (int/string)
-	 *  - time
-	 *    - Creates a time
-	 *    - l10n-field: time
-	 *    - params: timestamp (int/string)
-	 * @since 6.0.0 - parameter $options was added in 8.0.0
-	 */
-	public function l(string $type, $data, array $options = []);
+    /**
+     * Localization
+     * @param string $type Type of localization
+     * @param \DateTime|int|string $data parameters for this localization
+     * @param array $options currently supports following options:
+     * 			- 'width': handed into \Punic\Calendar::formatDate as second parameter
+     * @return string|int|false
+     *
+     * Returns the localized data.
+     *
+     * Implemented types:
+     *  - date
+     *    - Creates a date
+     *    - l10n-field: date
+     *    - params: timestamp (int/string)
+     *  - datetime
+     *    - Creates date and time
+     *    - l10n-field: datetime
+     *    - params: timestamp (int/string)
+     *  - time
+     *    - Creates a time
+     *    - l10n-field: time
+     *    - params: timestamp (int/string)
+     * @since 6.0.0 - parameter $options was added in 8.0.0
+     */
+    public function l(string $type, $data, array $options = []);
 
 
-	/**
-	 * The code (en, de, ...) of the language that is used for this IL10N object
-	 *
-	 * @return string language
-	 * @since 7.0.0
-	 */
-	public function getLanguageCode(): string ;
+    /**
+     * The code (en, de, ...) of the language that is used for this IL10N object
+     *
+     * @return string language
+     * @since 7.0.0
+     */
+    public function getLanguageCode(): string ;
 
-	/**
-	 * * The code (en_US, fr_CA, ...) of the locale that is used for this IL10N object
-	 *
-	 * @return string locale
-	 * @since 14.0.0
-	 */
-	public function getLocaleCode(): string;
+    /**
+     * * The code (en_US, fr_CA, ...) of the locale that is used for this IL10N object
+     *
+     * @return string locale
+     * @since 14.0.0
+     */
+    public function getLocaleCode(): string;
 }

core/Command/Base.php

Spacing +5 added lines, -5 removed lines

@@ -73,19 +73,19 @@
 			default:
 				foreach ($items as $key => $item) {
 					if (is_array($item)) {
-						$output->writeln($prefix . $key . ':');
-						$this->writeArrayInOutputFormat($input, $output, $item, '  ' . $prefix);
+						$output->writeln($prefix.$key.':');
+						$this->writeArrayInOutputFormat($input, $output, $item, '  '.$prefix);
 						continue;
 					}
 					if (!is_int($key) || ListCommand::class === get_class($this)) {
 						$value = $this->valueToString($item);
 						if (!is_null($value)) {
-							$output->writeln($prefix . $key . ': ' . $value);
+							$output->writeln($prefix.$key.': '.$value);
 						} else {
-							$output->writeln($prefix . $key);
+							$output->writeln($prefix.$key);
 						}
 					} else {
-						$output->writeln($prefix . $this->valueToString($item));
+						$output->writeln($prefix.$this->valueToString($item));
 					}
 				}
 				break;

Indentation +162 added lines, -162 removed lines

@@ -35,166 +35,166 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Base extends Command implements CompletionAwareInterface {
-	public const OUTPUT_FORMAT_PLAIN = 'plain';
-	public const OUTPUT_FORMAT_JSON = 'json';
-	public const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty';
-
-	protected string $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN;
-	private bool $php_pcntl_signal = false;
-	private bool $interrupted = false;
-
-	protected function configure() {
-		$this
-			->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			)
-		;
-	}
-
-	protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, array $items, string $prefix = '  - '): void {
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_JSON:
-				$output->writeln(json_encode($items));
-				break;
-			case self::OUTPUT_FORMAT_JSON_PRETTY:
-				$output->writeln(json_encode($items, JSON_PRETTY_PRINT));
-				break;
-			default:
-				foreach ($items as $key => $item) {
-					if (is_array($item)) {
-						$output->writeln($prefix . $key . ':');
-						$this->writeArrayInOutputFormat($input, $output, $item, '  ' . $prefix);
-						continue;
-					}
-					if (!is_int($key) || ListCommand::class === get_class($this)) {
-						$value = $this->valueToString($item);
-						if (!is_null($value)) {
-							$output->writeln($prefix . $key . ': ' . $value);
-						} else {
-							$output->writeln($prefix . $key);
-						}
-					} else {
-						$output->writeln($prefix . $this->valueToString($item));
-					}
-				}
-				break;
-		}
-	}
-
-	protected function writeTableInOutputFormat(InputInterface $input, OutputInterface $output, array $items): void {
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_JSON:
-				$output->writeln(json_encode($items));
-				break;
-			case self::OUTPUT_FORMAT_JSON_PRETTY:
-				$output->writeln(json_encode($items, JSON_PRETTY_PRINT));
-				break;
-			default:
-				$table = new Table($output);
-				$table->setRows($items);
-				if (!empty($items) && is_string(array_key_first(reset($items)))) {
-					$table->setHeaders(array_keys(reset($items)));
-				}
-				$table->render();
-				break;
-		}
-	}
-
-
-	/**
-	 * @param mixed $item
-	 */
-	protected function writeMixedInOutputFormat(InputInterface $input, OutputInterface $output, $item) {
-		if (is_array($item)) {
-			$this->writeArrayInOutputFormat($input, $output, $item, '');
-			return;
-		}
-
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_JSON:
-				$output->writeln(json_encode($item));
-				break;
-			case self::OUTPUT_FORMAT_JSON_PRETTY:
-				$output->writeln(json_encode($item, JSON_PRETTY_PRINT));
-				break;
-			default:
-				$output->writeln($this->valueToString($item, false));
-				break;
-		}
-	}
-
-	protected function valueToString($value, bool $returnNull = true): ?string {
-		if ($value === false) {
-			return 'false';
-		} elseif ($value === true) {
-			return 'true';
-		} elseif ($value === null) {
-			return $returnNull ? null : 'null';
-		} else {
-			return $value;
-		}
-	}
-
-	/**
-	 * Throw InterruptedException when interrupted by user
-	 *
-	 * @throws InterruptedException
-	 */
-	protected function abortIfInterrupted() {
-		if ($this->php_pcntl_signal === false) {
-			return;
-		}
-
-		pcntl_signal_dispatch();
-
-		if ($this->interrupted === true) {
-			throw new InterruptedException('Command interrupted by user');
-		}
-	}
-
-	/**
-	 * Changes the status of the command to "interrupted" if ctrl-c has been pressed
-	 *
-	 * Gives a chance to the command to properly terminate what it's doing
-	 */
-	protected function cancelOperation() {
-		$this->interrupted = true;
-	}
-
-	public function run(InputInterface $input, OutputInterface $output) {
-		// check if the php pcntl_signal functions are accessible
-		$this->php_pcntl_signal = function_exists('pcntl_signal');
-		if ($this->php_pcntl_signal) {
-			// Collect interrupts and notify the running command
-			pcntl_signal(SIGTERM, [$this, 'cancelOperation']);
-			pcntl_signal(SIGINT, [$this, 'cancelOperation']);
-		}
-
-		return parent::run($input, $output);
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'output') {
-			return ['plain', 'json', 'json_pretty'];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    public const OUTPUT_FORMAT_PLAIN = 'plain';
+    public const OUTPUT_FORMAT_JSON = 'json';
+    public const OUTPUT_FORMAT_JSON_PRETTY = 'json_pretty';
+
+    protected string $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN;
+    private bool $php_pcntl_signal = false;
+    private bool $interrupted = false;
+
+    protected function configure() {
+        $this
+            ->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            )
+        ;
+    }
+
+    protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, array $items, string $prefix = '  - '): void {
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_JSON:
+                $output->writeln(json_encode($items));
+                break;
+            case self::OUTPUT_FORMAT_JSON_PRETTY:
+                $output->writeln(json_encode($items, JSON_PRETTY_PRINT));
+                break;
+            default:
+                foreach ($items as $key => $item) {
+                    if (is_array($item)) {
+                        $output->writeln($prefix . $key . ':');
+                        $this->writeArrayInOutputFormat($input, $output, $item, '  ' . $prefix);
+                        continue;
+                    }
+                    if (!is_int($key) || ListCommand::class === get_class($this)) {
+                        $value = $this->valueToString($item);
+                        if (!is_null($value)) {
+                            $output->writeln($prefix . $key . ': ' . $value);
+                        } else {
+                            $output->writeln($prefix . $key);
+                        }
+                    } else {
+                        $output->writeln($prefix . $this->valueToString($item));
+                    }
+                }
+                break;
+        }
+    }
+
+    protected function writeTableInOutputFormat(InputInterface $input, OutputInterface $output, array $items): void {
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_JSON:
+                $output->writeln(json_encode($items));
+                break;
+            case self::OUTPUT_FORMAT_JSON_PRETTY:
+                $output->writeln(json_encode($items, JSON_PRETTY_PRINT));
+                break;
+            default:
+                $table = new Table($output);
+                $table->setRows($items);
+                if (!empty($items) && is_string(array_key_first(reset($items)))) {
+                    $table->setHeaders(array_keys(reset($items)));
+                }
+                $table->render();
+                break;
+        }
+    }
+
+
+    /**
+     * @param mixed $item
+     */
+    protected function writeMixedInOutputFormat(InputInterface $input, OutputInterface $output, $item) {
+        if (is_array($item)) {
+            $this->writeArrayInOutputFormat($input, $output, $item, '');
+            return;
+        }
+
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_JSON:
+                $output->writeln(json_encode($item));
+                break;
+            case self::OUTPUT_FORMAT_JSON_PRETTY:
+                $output->writeln(json_encode($item, JSON_PRETTY_PRINT));
+                break;
+            default:
+                $output->writeln($this->valueToString($item, false));
+                break;
+        }
+    }
+
+    protected function valueToString($value, bool $returnNull = true): ?string {
+        if ($value === false) {
+            return 'false';
+        } elseif ($value === true) {
+            return 'true';
+        } elseif ($value === null) {
+            return $returnNull ? null : 'null';
+        } else {
+            return $value;
+        }
+    }
+
+    /**
+     * Throw InterruptedException when interrupted by user
+     *
+     * @throws InterruptedException
+     */
+    protected function abortIfInterrupted() {
+        if ($this->php_pcntl_signal === false) {
+            return;
+        }
+
+        pcntl_signal_dispatch();
+
+        if ($this->interrupted === true) {
+            throw new InterruptedException('Command interrupted by user');
+        }
+    }
+
+    /**
+     * Changes the status of the command to "interrupted" if ctrl-c has been pressed
+     *
+     * Gives a chance to the command to properly terminate what it's doing
+     */
+    protected function cancelOperation() {
+        $this->interrupted = true;
+    }
+
+    public function run(InputInterface $input, OutputInterface $output) {
+        // check if the php pcntl_signal functions are accessible
+        $this->php_pcntl_signal = function_exists('pcntl_signal');
+        if ($this->php_pcntl_signal) {
+            // Collect interrupts and notify the running command
+            pcntl_signal(SIGTERM, [$this, 'cancelOperation']);
+            pcntl_signal(SIGINT, [$this, 'cancelOperation']);
+        }
+
+        return parent::run($input, $output);
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'output') {
+            return ['plain', 'json', 'json_pretty'];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }

apps/files/lib/Activity/Filter/FileChanges.php

Indentation +60 added lines, -60 removed lines

@@ -30,72 +30,72 @@
 
 class FileChanges implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	/**
-	 * @param IL10N $l
-	 * @param IURLGenerator $url
-	 */
-	public function __construct(IL10N $l, IURLGenerator $url) {
-		$this->l = $l;
-		$this->url = $url;
-	}
+    /**
+     * @param IL10N $l
+     * @param IURLGenerator $url
+     */
+    public function __construct(IL10N $l, IURLGenerator $url) {
+        $this->l = $l;
+        $this->url = $url;
+    }
 
-	/**
-	 * @return string Lowercase a-z only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'files';
-	}
+    /**
+     * @return string Lowercase a-z only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'files';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('File changes');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('File changes');
+    }
 
-	/**
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 30;
-	}
+    /**
+     * @return int
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 30;
+    }
 
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files.svg'));
-	}
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files.svg'));
+    }
 
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect([
-			'file_created',
-			'file_changed',
-			'file_deleted',
-			'file_restored',
-		], $types);
-	}
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect([
+            'file_created',
+            'file_changed',
+            'file_deleted',
+            'file_restored',
+        ], $types);
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return ['files'];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return ['files'];
+    }
 }