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

Passed

Push — master ( 47b10c...1d2707 )

by Morris

created 2021-01-22 15:26 UTC

Status

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

@@ -42,96 +42,96 @@
 block discarded – undo
 
 class TwoFactor implements ISettings {
 
-	/** @var ProviderLoader */
-	private $providerLoader;
-
-	/** @var MandatoryTwoFactor */
-	private $mandatoryTwoFactor;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var string|null */
-	private $uid;
-
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(ProviderLoader $providerLoader,
-								MandatoryTwoFactor $mandatoryTwoFactor,
-								IUserSession $userSession,
-								IConfig $config,
-								?string $UserId) {
-		$this->providerLoader = $providerLoader;
-		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
-		$this->userSession = $userSession;
-		$this->uid = $UserId;
-		$this->config = $config;
-	}
-
-	public function getForm(): TemplateResponse {
-		return new TemplateResponse('settings', 'settings/personal/security/twofactor', [
-			'twoFactorProviderData' => $this->getTwoFactorProviderData(),
-			'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false)
-		]);
-	}
-
-	public function getSection(): ?string {
-		if (!$this->shouldShow()) {
-			return null;
-		}
-		return 'security';
-	}
-
-	public function getPriority(): int {
-		return 15;
-	}
-
-	private function shouldShow(): bool {
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			// Actually impossible, but still …
-			return false;
-		}
-
-		// Anyone who's supposed to use 2FA should see 2FA settings
-		if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
-			return true;
-		}
-
-		// If there is at least one provider with personal settings but it's not
-		// the backup codes provider, then these settings should show.
-		try {
-			$providers = $this->providerLoader->getProviders($user);
-		} catch (Exception $e) {
-			// Let's hope for the best
-			return true;
-		}
-		foreach ($providers as $provider) {
-			if ($provider instanceof IProvidesPersonalSettings
-				&& !($provider instanceof BackupCodesProvider)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private function getTwoFactorProviderData(): array {
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			// Actually impossible, but still …
-			return [];
-		}
-
-		return [
-			'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
-				return [
-					'provider' => $provider,
-					'settings' => $provider->getPersonalSettings($user)
-				];
-			}, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
-				return $provider instanceof IProvidesPersonalSettings;
-			}))
-		];
-	}
+    /** @var ProviderLoader */
+    private $providerLoader;
+
+    /** @var MandatoryTwoFactor */
+    private $mandatoryTwoFactor;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var string|null */
+    private $uid;
+
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(ProviderLoader $providerLoader,
+                                MandatoryTwoFactor $mandatoryTwoFactor,
+                                IUserSession $userSession,
+                                IConfig $config,
+                                ?string $UserId) {
+        $this->providerLoader = $providerLoader;
+        $this->mandatoryTwoFactor = $mandatoryTwoFactor;
+        $this->userSession = $userSession;
+        $this->uid = $UserId;
+        $this->config = $config;
+    }
+
+    public function getForm(): TemplateResponse {
+        return new TemplateResponse('settings', 'settings/personal/security/twofactor', [
+            'twoFactorProviderData' => $this->getTwoFactorProviderData(),
+            'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false)
+        ]);
+    }
+
+    public function getSection(): ?string {
+        if (!$this->shouldShow()) {
+            return null;
+        }
+        return 'security';
+    }
+
+    public function getPriority(): int {
+        return 15;
+    }
+
+    private function shouldShow(): bool {
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            // Actually impossible, but still …
+            return false;
+        }
+
+        // Anyone who's supposed to use 2FA should see 2FA settings
+        if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
+            return true;
+        }
+
+        // If there is at least one provider with personal settings but it's not
+        // the backup codes provider, then these settings should show.
+        try {
+            $providers = $this->providerLoader->getProviders($user);
+        } catch (Exception $e) {
+            // Let's hope for the best
+            return true;
+        }
+        foreach ($providers as $provider) {
+            if ($provider instanceof IProvidesPersonalSettings
+                && !($provider instanceof BackupCodesProvider)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private function getTwoFactorProviderData(): array {
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            // Actually impossible, but still …
+            return [];
+        }
+
+        return [
+            'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
+                return [
+                    'provider' => $provider,
+                    'settings' => $provider->getPersonalSettings($user)
+                ];
+            }, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
+                return $provider instanceof IProvidesPersonalSettings;
+            }))
+        ];
+    }
 }

Please login to merge, or discard this patch.

lib/public/Settings/ISettings.php 1 patch

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

@@ -31,25 +31,25 @@
 block discarded – undo
  */
 interface ISettings {
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm();
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm();
 
-	/**
-	 * @return string|null the section ID, e.g. 'sharing' or null to not show the setting
-	 * @since 9.1
-	 */
-	public function getSection();
+    /**
+     * @return string|null the section ID, e.g. 'sharing' or null to not show the setting
+     * @since 9.1
+     */
+    public function getSection();
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority();
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority();
 }

Please login to merge, or discard this patch.

		@@ -42,96 +42,96 @@
		block discarded – undo
42	42
43	43	class TwoFactor implements ISettings {
44	44
45		- /** @var ProviderLoader */
46		- private $providerLoader;
47		-
48		- /** @var MandatoryTwoFactor */
49		- private $mandatoryTwoFactor;
50		-
51		- /** @var IUserSession */
52		- private $userSession;
53		-
54		- /** @var string\|null */
55		- private $uid;
56		-
57		- /** @var IConfig */
58		- private $config;
59		-
60		- public function __construct(ProviderLoader $providerLoader,
61		- MandatoryTwoFactor $mandatoryTwoFactor,
62		- IUserSession $userSession,
63		- IConfig $config,
64		- ?string $UserId) {
65		- $this->providerLoader = $providerLoader;
66		- $this->mandatoryTwoFactor = $mandatoryTwoFactor;
67		- $this->userSession = $userSession;
68		- $this->uid = $UserId;
69		- $this->config = $config;
70		- }
71		-
72		- public function getForm(): TemplateResponse {
73		- return new TemplateResponse('settings', 'settings/personal/security/twofactor', [
74		- 'twoFactorProviderData' => $this->getTwoFactorProviderData(),
75		- 'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false)
76		- ]);
77		- }
78		-
79		- public function getSection(): ?string {
80		- if (!$this->shouldShow()) {
81		- return null;
82		- }
83		- return 'security';
84		- }
85		-
86		- public function getPriority(): int {
87		- return 15;
88		- }
89		-
90		- private function shouldShow(): bool {
91		- $user = $this->userSession->getUser();
92		- if (is_null($user)) {
93		- // Actually impossible, but still …
94		- return false;
95		- }
96		-
97		- // Anyone who's supposed to use 2FA should see 2FA settings
98		- if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
99		- return true;
100		- }
101		-
102		- // If there is at least one provider with personal settings but it's not
103		- // the backup codes provider, then these settings should show.
104		- try {
105		- $providers = $this->providerLoader->getProviders($user);
106		- } catch (Exception $e) {
107		- // Let's hope for the best
108		- return true;
109		- }
110		- foreach ($providers as $provider) {
111		- if ($provider instanceof IProvidesPersonalSettings
112		- && !($provider instanceof BackupCodesProvider)) {
113		- return true;
114		- }
115		- }
116		- return false;
117		- }
118		-
119		- private function getTwoFactorProviderData(): array {
120		- $user = $this->userSession->getUser();
121		- if (is_null($user)) {
122		- // Actually impossible, but still …
123		- return [];
124		- }
125		-
126		- return [
127		- 'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
128		- return [
129		- 'provider' => $provider,
130		- 'settings' => $provider->getPersonalSettings($user)
131		- ];
132		- }, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
133		- return $provider instanceof IProvidesPersonalSettings;
134		- }))
135		- ];
136		- }
	45	+ /** @var ProviderLoader */
	46	+ private $providerLoader;
	47	+
	48	+ /** @var MandatoryTwoFactor */
	49	+ private $mandatoryTwoFactor;
	50	+
	51	+ /** @var IUserSession */
	52	+ private $userSession;
	53	+
	54	+ /** @var string\|null */
	55	+ private $uid;
	56	+
	57	+ /** @var IConfig */
	58	+ private $config;
	59	+
	60	+ public function __construct(ProviderLoader $providerLoader,
	61	+ MandatoryTwoFactor $mandatoryTwoFactor,
	62	+ IUserSession $userSession,
	63	+ IConfig $config,
	64	+ ?string $UserId) {
	65	+ $this->providerLoader = $providerLoader;
	66	+ $this->mandatoryTwoFactor = $mandatoryTwoFactor;
	67	+ $this->userSession = $userSession;
	68	+ $this->uid = $UserId;
	69	+ $this->config = $config;
	70	+ }
	71	+
	72	+ public function getForm(): TemplateResponse {
	73	+ return new TemplateResponse('settings', 'settings/personal/security/twofactor', [
	74	+ 'twoFactorProviderData' => $this->getTwoFactorProviderData(),
	75	+ 'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false)
	76	+ ]);
	77	+ }
	78	+
	79	+ public function getSection(): ?string {
	80	+ if (!$this->shouldShow()) {
	81	+ return null;
	82	+ }
	83	+ return 'security';
	84	+ }
	85	+
	86	+ public function getPriority(): int {
	87	+ return 15;
	88	+ }
	89	+
	90	+ private function shouldShow(): bool {
	91	+ $user = $this->userSession->getUser();
	92	+ if (is_null($user)) {
	93	+ // Actually impossible, but still …
	94	+ return false;
	95	+ }
	96	+
	97	+ // Anyone who's supposed to use 2FA should see 2FA settings
	98	+ if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
	99	+ return true;
	100	+ }
	101	+
	102	+ // If there is at least one provider with personal settings but it's not
	103	+ // the backup codes provider, then these settings should show.
	104	+ try {
	105	+ $providers = $this->providerLoader->getProviders($user);
	106	+ } catch (Exception $e) {
	107	+ // Let's hope for the best
	108	+ return true;
	109	+ }
	110	+ foreach ($providers as $provider) {
	111	+ if ($provider instanceof IProvidesPersonalSettings
	112	+ && !($provider instanceof BackupCodesProvider)) {
	113	+ return true;
	114	+ }
	115	+ }
	116	+ return false;
	117	+ }
	118	+
	119	+ private function getTwoFactorProviderData(): array {
	120	+ $user = $this->userSession->getUser();
	121	+ if (is_null($user)) {
	122	+ // Actually impossible, but still …
	123	+ return [];
	124	+ }
	125	+
	126	+ return [
	127	+ 'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
	128	+ return [
	129	+ 'provider' => $provider,
	130	+ 'settings' => $provider->getPersonalSettings($user)
	131	+ ];
	132	+ }, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
	133	+ return $provider instanceof IProvidesPersonalSettings;
	134	+ }))
	135	+ ];
	136	+ }
137	137	}

		@@ -31,25 +31,25 @@
		block discarded – undo
31	31	*/
32	32	interface ISettings {
33	33
34		- /**
35		- * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
36		- * @since 9.1
37		- */
38		- public function getForm();
	34	+ /**
	35	+ * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
	36	+ * @since 9.1
	37	+ */
	38	+ public function getForm();
39	39
40		- /**
41		- * @return string\|null the section ID, e.g. 'sharing' or null to not show the setting
42		- * @since 9.1
43		- */
44		- public function getSection();
	40	+ /**
	41	+ * @return string\|null the section ID, e.g. 'sharing' or null to not show the setting
	42	+ * @since 9.1
	43	+ */
	44	+ public function getSection();
45	45
46		- /**
47		- * @return int whether the form should be rather on the top or bottom of
48		- * the admin section. The forms are arranged in ascending order of the
49		- * priority values. It is required to return a value between 0 and 100.
50		- *
51		- * E.g.: 70
52		- * @since 9.1
53		- */
54		- public function getPriority();
	46	+ /**
	47	+ * @return int whether the form should be rather on the top or bottom of
	48	+ * the admin section. The forms are arranged in ascending order of the
	49	+ * priority values. It is required to return a value between 0 and 100.
	50	+ *
	51	+ * E.g.: 70
	52	+ * @since 9.1
	53	+ */
	54	+ public function getPriority();
55	55	}

nextcloud / server

Push — master ( 47b10c...1d2707 )

Status

Category

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

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