Inspection of "Merge pull request #12886 from nextcloud/td/oauth2..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( b7410d...4f47df )

by Roeland

created 2018-12-07 12:37 UTC

Status

Indentation +52 added lines, -52 removed lines patch added patch discarded remove patch

@@ -30,62 +30,62 @@
 block discarded – undo
 
 class ClientMapper extends QBMapper {
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'oauth2_clients');
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'oauth2_clients');
+    }
 
-	/**
-	 * @param string $clientIdentifier
-	 * @return Client
-	 * @throws ClientNotFoundException
-	 */
-	public function getByIdentifier(string $clientIdentifier): Client {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('client_identifier', $qb->createNamedParameter($clientIdentifier)));
+    /**
+     * @param string $clientIdentifier
+     * @return Client
+     * @throws ClientNotFoundException
+     */
+    public function getByIdentifier(string $clientIdentifier): Client {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('client_identifier', $qb->createNamedParameter($clientIdentifier)));
 
-		try {
-			$client = $this->findEntity($qb);
-		} catch (IMapperException $e) {
-			throw new ClientNotFoundException('could not find client '.$clientIdentifier, 0, $e);
-		}
-		return $client;
-	}
+        try {
+            $client = $this->findEntity($qb);
+        } catch (IMapperException $e) {
+            throw new ClientNotFoundException('could not find client '.$clientIdentifier, 0, $e);
+        }
+        return $client;
+    }
 
-	/**
-	 * @param int $id internal id of the client
-	 * @return Client
-	 * @throws ClientNotFoundException
-	 */
-	public function getByUid(int $id): Client {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+    /**
+     * @param int $id internal id of the client
+     * @return Client
+     * @throws ClientNotFoundException
+     */
+    public function getByUid(int $id): Client {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
 
-		try {
-			$client = $this->findEntity($qb);
-		} catch (IMapperException $e) {
-			throw new ClientNotFoundException('could not find client with id '.$id, 0, $e);
-		}
-		return $client;
-	}
+        try {
+            $client = $this->findEntity($qb);
+        } catch (IMapperException $e) {
+            throw new ClientNotFoundException('could not find client with id '.$id, 0, $e);
+        }
+        return $client;
+    }
 
-	/**
-	 * @return Client[]
-	 */
-	public function getClients(): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName);
+    /**
+     * @return Client[]
+     */
+    public function getClients(): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName);
 
-		return $this->findEntities($qb);
-	}
+        return $this->findEntities($qb);
+    }
 }

Please login to merge, or discard this patch.

apps/oauth2/lib/Db/AccessTokenMapper.php 1 patch

Indentation +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -30,44 +30,44 @@
 block discarded – undo
 
 class AccessTokenMapper extends QBMapper {
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'oauth2_access_tokens');
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'oauth2_access_tokens');
+    }
 
-	/**
-	 * @param string $code
-	 * @return AccessToken
-	 * @throws AccessTokenNotFoundException
-	 */
-	public function getByCode(string $code): AccessToken {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('hashed_code', $qb->createNamedParameter(hash('sha512', $code))));
+    /**
+     * @param string $code
+     * @return AccessToken
+     * @throws AccessTokenNotFoundException
+     */
+    public function getByCode(string $code): AccessToken {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('hashed_code', $qb->createNamedParameter(hash('sha512', $code))));
 
-		try {
-			$token = $this->findEntity($qb);
-		} catch (IMapperException $e) {
-			throw new AccessTokenNotFoundException('Could not find access token', 0, $e);
-		}
+        try {
+            $token = $this->findEntity($qb);
+        } catch (IMapperException $e) {
+            throw new AccessTokenNotFoundException('Could not find access token', 0, $e);
+        }
 
-		return $token;
-	}
+        return $token;
+    }
 
-	/**
-	 * delete all access token from a given client
-	 *
-	 * @param int $id
-	 */
-	public function deleteByClientId(int $id) {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->delete($this->tableName)
-			->where($qb->expr()->eq('client_id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
-	}
+    /**
+     * delete all access token from a given client
+     *
+     * @param int $id
+     */
+    public function deleteByClientId(int $id) {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->delete($this->tableName)
+            ->where($qb->expr()->eq('client_id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $qb->execute();
+    }
 }

Please login to merge, or discard this patch.

		@@ -30,62 +30,62 @@
		block discarded – undo
30	30
31	31	class ClientMapper extends QBMapper {
32	32
33		- /**
34		- * @param IDBConnection $db
35		- */
36		- public function __construct(IDBConnection $db) {
37		- parent::__construct($db, 'oauth2_clients');
38		- }
	33	+ /**
	34	+ * @param IDBConnection $db
	35	+ */
	36	+ public function __construct(IDBConnection $db) {
	37	+ parent::__construct($db, 'oauth2_clients');
	38	+ }
39	39
40		- /**
41		- * @param string $clientIdentifier
42		- * @return Client
43		- * @throws ClientNotFoundException
44		- */
45		- public function getByIdentifier(string $clientIdentifier): Client {
46		- $qb = $this->db->getQueryBuilder();
47		- $qb
48		- ->select('*')
49		- ->from($this->tableName)
50		- ->where($qb->expr()->eq('client_identifier', $qb->createNamedParameter($clientIdentifier)));
	40	+ /**
	41	+ * @param string $clientIdentifier
	42	+ * @return Client
	43	+ * @throws ClientNotFoundException
	44	+ */
	45	+ public function getByIdentifier(string $clientIdentifier): Client {
	46	+ $qb = $this->db->getQueryBuilder();
	47	+ $qb
	48	+ ->select('*')
	49	+ ->from($this->tableName)
	50	+ ->where($qb->expr()->eq('client_identifier', $qb->createNamedParameter($clientIdentifier)));
51	51
52		- try {
53		- $client = $this->findEntity($qb);
54		- } catch (IMapperException $e) {
55		- throw new ClientNotFoundException('could not find client '.$clientIdentifier, 0, $e);
56		- }
57		- return $client;
58		- }
	52	+ try {
	53	+ $client = $this->findEntity($qb);
	54	+ } catch (IMapperException $e) {
	55	+ throw new ClientNotFoundException('could not find client '.$clientIdentifier, 0, $e);
	56	+ }
	57	+ return $client;
	58	+ }
59	59
60		- /**
61		- * @param int $id internal id of the client
62		- * @return Client
63		- * @throws ClientNotFoundException
64		- */
65		- public function getByUid(int $id): Client {
66		- $qb = $this->db->getQueryBuilder();
67		- $qb
68		- ->select('*')
69		- ->from($this->tableName)
70		- ->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
	60	+ /**
	61	+ * @param int $id internal id of the client
	62	+ * @return Client
	63	+ * @throws ClientNotFoundException
	64	+ */
	65	+ public function getByUid(int $id): Client {
	66	+ $qb = $this->db->getQueryBuilder();
	67	+ $qb
	68	+ ->select('*')
	69	+ ->from($this->tableName)
	70	+ ->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
71	71
72		- try {
73		- $client = $this->findEntity($qb);
74		- } catch (IMapperException $e) {
75		- throw new ClientNotFoundException('could not find client with id '.$id, 0, $e);
76		- }
77		- return $client;
78		- }
	72	+ try {
	73	+ $client = $this->findEntity($qb);
	74	+ } catch (IMapperException $e) {
	75	+ throw new ClientNotFoundException('could not find client with id '.$id, 0, $e);
	76	+ }
	77	+ return $client;
	78	+ }
79	79
80		- /**
81		- * @return Client[]
82		- */
83		- public function getClients(): array {
84		- $qb = $this->db->getQueryBuilder();
85		- $qb
86		- ->select('*')
87		- ->from($this->tableName);
	80	+ /**
	81	+ * @return Client[]
	82	+ */
	83	+ public function getClients(): array {
	84	+ $qb = $this->db->getQueryBuilder();
	85	+ $qb
	86	+ ->select('*')
	87	+ ->from($this->tableName);
88	88
89		- return $this->findEntities($qb);
90		- }
	89	+ return $this->findEntities($qb);
	90	+ }
91	91	}

		@@ -30,44 +30,44 @@
		block discarded – undo
30	30
31	31	class AccessTokenMapper extends QBMapper {
32	32
33		- /**
34		- * @param IDBConnection $db
35		- */
36		- public function __construct(IDBConnection $db) {
37		- parent::__construct($db, 'oauth2_access_tokens');
38		- }
	33	+ /**
	34	+ * @param IDBConnection $db
	35	+ */
	36	+ public function __construct(IDBConnection $db) {
	37	+ parent::__construct($db, 'oauth2_access_tokens');
	38	+ }
39	39
40		- /**
41		- * @param string $code
42		- * @return AccessToken
43		- * @throws AccessTokenNotFoundException
44		- */
45		- public function getByCode(string $code): AccessToken {
46		- $qb = $this->db->getQueryBuilder();
47		- $qb
48		- ->select('*')
49		- ->from($this->tableName)
50		- ->where($qb->expr()->eq('hashed_code', $qb->createNamedParameter(hash('sha512', $code))));
	40	+ /**
	41	+ * @param string $code
	42	+ * @return AccessToken
	43	+ * @throws AccessTokenNotFoundException
	44	+ */
	45	+ public function getByCode(string $code): AccessToken {
	46	+ $qb = $this->db->getQueryBuilder();
	47	+ $qb
	48	+ ->select('*')
	49	+ ->from($this->tableName)
	50	+ ->where($qb->expr()->eq('hashed_code', $qb->createNamedParameter(hash('sha512', $code))));
51	51
52		- try {
53		- $token = $this->findEntity($qb);
54		- } catch (IMapperException $e) {
55		- throw new AccessTokenNotFoundException('Could not find access token', 0, $e);
56		- }
	52	+ try {
	53	+ $token = $this->findEntity($qb);
	54	+ } catch (IMapperException $e) {
	55	+ throw new AccessTokenNotFoundException('Could not find access token', 0, $e);
	56	+ }
57	57
58		- return $token;
59		- }
	58	+ return $token;
	59	+ }
60	60
61		- /**
62		- * delete all access token from a given client
63		- *
64		- * @param int $id
65		- */
66		- public function deleteByClientId(int $id) {
67		- $qb = $this->db->getQueryBuilder();
68		- $qb
69		- ->delete($this->tableName)
70		- ->where($qb->expr()->eq('client_id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
71		- $qb->execute();
72		- }
	61	+ /**
	62	+ * delete all access token from a given client
	63	+ *
	64	+ * @param int $id
	65	+ */
	66	+ public function deleteByClientId(int $id) {
	67	+ $qb = $this->db->getQueryBuilder();
	68	+ $qb
	69	+ ->delete($this->tableName)
	70	+ ->where($qb->expr()->eq('client_id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
	71	+ $qb->execute();
	72	+ }
73	73	}

nextcloud / server

Push — master ( b7410d...4f47df )

Status

Category

Indentation +52 added lines, -52 removed lines patch added patch discarded remove patch

Indentation +36 added lines, -36 removed lines patch added patch discarded remove patch