Inspection of "Update SettingsController.php" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#10065)

by rakekniven

created 2018-06-30 06:52 UTC

Status

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

@@ -34,91 +34,91 @@
 block discarded – undo
 use OCP\Security\ISecureRandom;
 
 class SettingsController extends Controller {
-	/** @var ClientMapper */
-	private $clientMapper;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var AccessTokenMapper  */
-	private $accessTokenMapper;
-	/** @var  DefaultTokenMapper */
-	private $defaultTokenMapper;
-	/** @var IL10N */
-	private $l;
+    /** @var ClientMapper */
+    private $clientMapper;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var AccessTokenMapper  */
+    private $accessTokenMapper;
+    /** @var  DefaultTokenMapper */
+    private $defaultTokenMapper;
+    /** @var IL10N */
+    private $l;
 
-	const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ClientMapper $clientMapper
-	 * @param ISecureRandom $secureRandom
-	 * @param AccessTokenMapper $accessTokenMapper
-	 * @param DefaultTokenMapper $defaultTokenMapper
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								ClientMapper $clientMapper,
-								ISecureRandom $secureRandom,
-								AccessTokenMapper $accessTokenMapper,
-								DefaultTokenMapper $defaultTokenMapper,
-								IL10N $l
-	) {
-		parent::__construct($appName, $request);
-		$this->secureRandom = $secureRandom;
-		$this->clientMapper = $clientMapper;
-		$this->accessTokenMapper = $accessTokenMapper;
-		$this->defaultTokenMapper = $defaultTokenMapper;
-		$this->l = $l;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param ClientMapper $clientMapper
+     * @param ISecureRandom $secureRandom
+     * @param AccessTokenMapper $accessTokenMapper
+     * @param DefaultTokenMapper $defaultTokenMapper
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                ClientMapper $clientMapper,
+                                ISecureRandom $secureRandom,
+                                AccessTokenMapper $accessTokenMapper,
+                                DefaultTokenMapper $defaultTokenMapper,
+                                IL10N $l
+    ) {
+        parent::__construct($appName, $request);
+        $this->secureRandom = $secureRandom;
+        $this->clientMapper = $clientMapper;
+        $this->accessTokenMapper = $accessTokenMapper;
+        $this->defaultTokenMapper = $defaultTokenMapper;
+        $this->l = $l;
+    }
 
-	public function addClient(string $name,
-							  string $redirectUri): JSONResponse {
+    public function addClient(string $name,
+                                string $redirectUri): JSONResponse {
 
-		if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED|FILTER_FLAG_HOST_REQUIRED) === false) {
-			return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST);
-		}
+        if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED|FILTER_FLAG_HOST_REQUIRED) === false) {
+            return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST);
+        }
 
-		$client = new Client();
-		$client->setName($name);
-		$client->setRedirectUri($redirectUri);
-		$client->setSecret($this->secureRandom->generate(64, self::validChars));
-		$client->setClientIdentifier($this->secureRandom->generate(64, self::validChars));
-		$client = $this->clientMapper->insert($client);
+        $client = new Client();
+        $client->setName($name);
+        $client->setRedirectUri($redirectUri);
+        $client->setSecret($this->secureRandom->generate(64, self::validChars));
+        $client->setClientIdentifier($this->secureRandom->generate(64, self::validChars));
+        $client = $this->clientMapper->insert($client);
 
-		$result = [
-			'id' => $client->getId(),
-			'name' => $client->getName(),
-			'redirectUri' => $client->getRedirectUri(),
-			'clientId' => $client->getClientIdentifier(),
-			'clientSecret' => $client->getSecret(),
-		];
+        $result = [
+            'id' => $client->getId(),
+            'name' => $client->getName(),
+            'redirectUri' => $client->getRedirectUri(),
+            'clientId' => $client->getClientIdentifier(),
+            'clientSecret' => $client->getSecret(),
+        ];
 
-		return new JSONResponse($result);
-	}
+        return new JSONResponse($result);
+    }
 
-	public function deleteClient(int $id): JSONResponse {
-		$client = $this->clientMapper->getByUid($id);
-		$this->accessTokenMapper->deleteByClientId($id);
-		$this->defaultTokenMapper->deleteByName($client->getName());
-		$this->clientMapper->delete($client);
-		return new JSONResponse([]);
-	}
+    public function deleteClient(int $id): JSONResponse {
+        $client = $this->clientMapper->getByUid($id);
+        $this->accessTokenMapper->deleteByClientId($id);
+        $this->defaultTokenMapper->deleteByName($client->getName());
+        $this->clientMapper->delete($client);
+        return new JSONResponse([]);
+    }
 
-	public function getClients(): JSONResponse {
-		$clients = $this->clientMapper->getClients();
+    public function getClients(): JSONResponse {
+        $clients = $this->clientMapper->getClients();
 
-		$result = [];
+        $result = [];
 
-		foreach ($clients as $client) {
-			$result[] = [
-				'id' => $client->getId(),
-				'name' => $client->getName(),
-				'redirectUri' => $client->getRedirectUri(),
-				'clientId' => $client->getClientIdentifier(),
-				'clientSecret' => $client->getSecret(),
-			];
-		}
+        foreach ($clients as $client) {
+            $result[] = [
+                'id' => $client->getId(),
+                'name' => $client->getName(),
+                'redirectUri' => $client->getRedirectUri(),
+                'clientId' => $client->getClientIdentifier(),
+                'clientSecret' => $client->getSecret(),
+            ];
+        }
 
-		return new JSONResponse($result);
-	}
+        return new JSONResponse($result);
+    }
 }

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -74,7 +74,7 @@
 block discarded – undo
 	public function addClient(string $name,
 							  string $redirectUri): JSONResponse {
 
-		if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED|FILTER_FLAG_HOST_REQUIRED) === false) {
+		if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED) === false) {
 			return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST);
 		}
 

Please login to merge, or discard this patch.

		@@ -34,91 +34,91 @@
		block discarded – undo
34	34	use OCP\Security\ISecureRandom;
35	35
36	36	class SettingsController extends Controller {
37		- /** @var ClientMapper */
38		- private $clientMapper;
39		- /** @var ISecureRandom */
40		- private $secureRandom;
41		- /** @var AccessTokenMapper */
42		- private $accessTokenMapper;
43		- /** @var DefaultTokenMapper */
44		- private $defaultTokenMapper;
45		- /** @var IL10N */
46		- private $l;
	37	+ /** @var ClientMapper */
	38	+ private $clientMapper;
	39	+ /** @var ISecureRandom */
	40	+ private $secureRandom;
	41	+ /** @var AccessTokenMapper */
	42	+ private $accessTokenMapper;
	43	+ /** @var DefaultTokenMapper */
	44	+ private $defaultTokenMapper;
	45	+ /** @var IL10N */
	46	+ private $l;
47	47
48		- const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
	48	+ const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
49	49
50		- /**
51		- * @param string $appName
52		- * @param IRequest $request
53		- * @param ClientMapper $clientMapper
54		- * @param ISecureRandom $secureRandom
55		- * @param AccessTokenMapper $accessTokenMapper
56		- * @param DefaultTokenMapper $defaultTokenMapper
57		- */
58		- public function __construct(string $appName,
59		- IRequest $request,
60		- ClientMapper $clientMapper,
61		- ISecureRandom $secureRandom,
62		- AccessTokenMapper $accessTokenMapper,
63		- DefaultTokenMapper $defaultTokenMapper,
64		- IL10N $l
65		- ) {
66		- parent::__construct($appName, $request);
67		- $this->secureRandom = $secureRandom;
68		- $this->clientMapper = $clientMapper;
69		- $this->accessTokenMapper = $accessTokenMapper;
70		- $this->defaultTokenMapper = $defaultTokenMapper;
71		- $this->l = $l;
72		- }
	50	+ /**
	51	+ * @param string $appName
	52	+ * @param IRequest $request
	53	+ * @param ClientMapper $clientMapper
	54	+ * @param ISecureRandom $secureRandom
	55	+ * @param AccessTokenMapper $accessTokenMapper
	56	+ * @param DefaultTokenMapper $defaultTokenMapper
	57	+ */
	58	+ public function __construct(string $appName,
	59	+ IRequest $request,
	60	+ ClientMapper $clientMapper,
	61	+ ISecureRandom $secureRandom,
	62	+ AccessTokenMapper $accessTokenMapper,
	63	+ DefaultTokenMapper $defaultTokenMapper,
	64	+ IL10N $l
	65	+ ) {
	66	+ parent::__construct($appName, $request);
	67	+ $this->secureRandom = $secureRandom;
	68	+ $this->clientMapper = $clientMapper;
	69	+ $this->accessTokenMapper = $accessTokenMapper;
	70	+ $this->defaultTokenMapper = $defaultTokenMapper;
	71	+ $this->l = $l;
	72	+ }
73	73
74		- public function addClient(string $name,
75		- string $redirectUri): JSONResponse {
	74	+ public function addClient(string $name,
	75	+ string $redirectUri): JSONResponse {
76	76
77		- if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED\|FILTER_FLAG_HOST_REQUIRED) === false) {
78		- return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST);
79		- }
	77	+ if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED\|FILTER_FLAG_HOST_REQUIRED) === false) {
	78	+ return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST);
	79	+ }
80	80
81		- $client = new Client();
82		- $client->setName($name);
83		- $client->setRedirectUri($redirectUri);
84		- $client->setSecret($this->secureRandom->generate(64, self::validChars));
85		- $client->setClientIdentifier($this->secureRandom->generate(64, self::validChars));
86		- $client = $this->clientMapper->insert($client);
	81	+ $client = new Client();
	82	+ $client->setName($name);
	83	+ $client->setRedirectUri($redirectUri);
	84	+ $client->setSecret($this->secureRandom->generate(64, self::validChars));
	85	+ $client->setClientIdentifier($this->secureRandom->generate(64, self::validChars));
	86	+ $client = $this->clientMapper->insert($client);
87	87
88		- $result = [
89		- 'id' => $client->getId(),
90		- 'name' => $client->getName(),
91		- 'redirectUri' => $client->getRedirectUri(),
92		- 'clientId' => $client->getClientIdentifier(),
93		- 'clientSecret' => $client->getSecret(),
94		- ];
	88	+ $result = [
	89	+ 'id' => $client->getId(),
	90	+ 'name' => $client->getName(),
	91	+ 'redirectUri' => $client->getRedirectUri(),
	92	+ 'clientId' => $client->getClientIdentifier(),
	93	+ 'clientSecret' => $client->getSecret(),
	94	+ ];
95	95
96		- return new JSONResponse($result);
97		- }
	96	+ return new JSONResponse($result);
	97	+ }
98	98
99		- public function deleteClient(int $id): JSONResponse {
100		- $client = $this->clientMapper->getByUid($id);
101		- $this->accessTokenMapper->deleteByClientId($id);
102		- $this->defaultTokenMapper->deleteByName($client->getName());
103		- $this->clientMapper->delete($client);
104		- return new JSONResponse([]);
105		- }
	99	+ public function deleteClient(int $id): JSONResponse {
	100	+ $client = $this->clientMapper->getByUid($id);
	101	+ $this->accessTokenMapper->deleteByClientId($id);
	102	+ $this->defaultTokenMapper->deleteByName($client->getName());
	103	+ $this->clientMapper->delete($client);
	104	+ return new JSONResponse([]);
	105	+ }
106	106
107		- public function getClients(): JSONResponse {
108		- $clients = $this->clientMapper->getClients();
	107	+ public function getClients(): JSONResponse {
	108	+ $clients = $this->clientMapper->getClients();
109	109
110		- $result = [];
	110	+ $result = [];
111	111
112		- foreach ($clients as $client) {
113		- $result[] = [
114		- 'id' => $client->getId(),
115		- 'name' => $client->getName(),
116		- 'redirectUri' => $client->getRedirectUri(),
117		- 'clientId' => $client->getClientIdentifier(),
118		- 'clientSecret' => $client->getSecret(),
119		- ];
120		- }
	112	+ foreach ($clients as $client) {
	113	+ $result[] = [
	114	+ 'id' => $client->getId(),
	115	+ 'name' => $client->getName(),
	116	+ 'redirectUri' => $client->getRedirectUri(),
	117	+ 'clientId' => $client->getClientIdentifier(),
	118	+ 'clientSecret' => $client->getSecret(),
	119	+ ];
	120	+ }
121	121
122		- return new JSONResponse($result);
123		- }
	122	+ return new JSONResponse($result);
	123	+ }
124	124	}

		@@ -74,7 +74,7 @@
		block discarded – undo
74	74	public function addClient(string $name,
75	75	string $redirectUri): JSONResponse {
76	76
77		- if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED\|FILTER_FLAG_HOST_REQUIRED) === false) {
	77	+ if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED \| FILTER_FLAG_HOST_REQUIRED) === false) {
78	78	return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST);
79	79	}
80	80

nextcloud / server

Pull Request — master (#10065)

Status

Category

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch