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

Passed

Push — master ( c2f62e...dfb274 )

by Joas

created 2021-07-09 09:01 UTC

Status

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

@@ -31,38 +31,38 @@
 block discarded – undo
 use OCP\IUserSession;
 
 class JSDataService extends InitialStateProvider {
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IConfig */
-	private $config;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(
-		IUserSession $userSession,
-		IConfig $config
-	) {
-		$this->userSession = $userSession;
-		$this->config = $config;
-	}
+    public function __construct(
+        IUserSession $userSession,
+        IConfig $config
+    ) {
+        $this->userSession = $userSession;
+        $this->config = $config;
+    }
 
-	public function getKey(): string {
-		return 'data';
-	}
+    public function getKey(): string {
+        return 'data';
+    }
 
-	public function getData() {
-		$user = $this->userSession->getUser();
+    public function getData() {
+        $user = $this->userSession->getUser();
 
-		if ($user === null) {
-			$theme = false;
-			$highcontrast = false;
-		} else {
-			$theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
-			$highcontrast = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'highcontrast', false) !== false;
-		}
+        if ($user === null) {
+            $theme = false;
+            $highcontrast = false;
+        } else {
+            $theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
+            $highcontrast = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'highcontrast', false) !== false;
+        }
 
-		return [
-			'checkMedia' => $user === null,
-			'theme' => $theme,
-			'highcontrast' => $highcontrast,
-		];
-	}
+        return [
+            'checkMedia' => $user === null,
+            'theme' => $theme,
+            'highcontrast' => $highcontrast,
+        ];
+    }
 }

Please login to merge, or discard this patch.

apps/accessibility/lib/AppInfo/Application.php 2 patches

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

@@ -43,42 +43,42 @@
 block discarded – undo
 
 class Application extends App implements IBootstrap {
 
-	/** @var string */
-	public const APP_ID = 'accessibility';
+    /** @var string */
+    public const APP_ID = 'accessibility';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerInitialStateProvider(JSDataService::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerInitialStateProvider(JSDataService::class);
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn([$this, 'injectCss']);
-	}
+    public function boot(IBootContext $context): void {
+        $context->injectFn([$this, 'injectCss']);
+    }
 
-	public function injectCss(IUserSession $userSession,
-							   IConfig $config,
-							   IURLGenerator $urlGenerator) {
-		// Inject the fake css on all pages if enabled and user is logged
-		$loggedUser = $userSession->getUser();
-		if ($loggedUser !== null) {
-			$userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
-			// we want to check if any theme or font is enabled.
-			if (count($userValues) > 0) {
-				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
-				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
-			}
-			\OCP\Util::addScript('accessibility', 'accessibilityoca');
-		} else {
-			$userValues = ['dark'];
+    public function injectCss(IUserSession $userSession,
+                                IConfig $config,
+                                IURLGenerator $urlGenerator) {
+        // Inject the fake css on all pages if enabled and user is logged
+        $loggedUser = $userSession->getUser();
+        if ($loggedUser !== null) {
+            $userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
+            // we want to check if any theme or font is enabled.
+            if (count($userValues) > 0) {
+                $hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
+                $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+                \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
+            }
+            \OCP\Util::addScript('accessibility', 'accessibilityoca');
+        } else {
+            $userValues = ['dark'];
 
-			$hash = md5(implode('-', $userValues));
-			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
-			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
-			\OCP\Util::addScript('accessibility', 'accessibilityoca');
-		}
-	}
+            $hash = md5(implode('-', $userValues));
+            $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+            \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
+            \OCP\Util::addScript('accessibility', 'accessibilityoca');
+        }
+    }
 }

Please login to merge, or discard this patch.

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

@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 			// we want to check if any theme or font is enabled.
 			if (count($userValues) > 0) {
 				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
 				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
 			}
 			\OCP\Util::addScript('accessibility', 'accessibilityoca');
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 			$userValues = ['dark'];
 
 			$hash = md5(implode('-', $userValues));
-			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
 			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
 			\OCP\Util::addScript('accessibility', 'accessibilityoca');
 		}

Please login to merge, or discard this patch.

		@@ -31,38 +31,38 @@
		block discarded – undo
31	31	use OCP\IUserSession;
32	32
33	33	class JSDataService extends InitialStateProvider {
34		- /** @var IUserSession */
35		- private $userSession;
36		- /** @var IConfig */
37		- private $config;
	34	+ /** @var IUserSession */
	35	+ private $userSession;
	36	+ /** @var IConfig */
	37	+ private $config;
38	38
39		- public function __construct(
40		- IUserSession $userSession,
41		- IConfig $config
42		- ) {
43		- $this->userSession = $userSession;
44		- $this->config = $config;
45		- }
	39	+ public function __construct(
	40	+ IUserSession $userSession,
	41	+ IConfig $config
	42	+ ) {
	43	+ $this->userSession = $userSession;
	44	+ $this->config = $config;
	45	+ }
46	46
47		- public function getKey(): string {
48		- return 'data';
49		- }
	47	+ public function getKey(): string {
	48	+ return 'data';
	49	+ }
50	50
51		- public function getData() {
52		- $user = $this->userSession->getUser();
	51	+ public function getData() {
	52	+ $user = $this->userSession->getUser();
53	53
54		- if ($user === null) {
55		- $theme = false;
56		- $highcontrast = false;
57		- } else {
58		- $theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
59		- $highcontrast = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'highcontrast', false) !== false;
60		- }
	54	+ if ($user === null) {
	55	+ $theme = false;
	56	+ $highcontrast = false;
	57	+ } else {
	58	+ $theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
	59	+ $highcontrast = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'highcontrast', false) !== false;
	60	+ }
61	61
62		- return [
63		- 'checkMedia' => $user === null,
64		- 'theme' => $theme,
65		- 'highcontrast' => $highcontrast,
66		- ];
67		- }
	62	+ return [
	63	+ 'checkMedia' => $user === null,
	64	+ 'theme' => $theme,
	65	+ 'highcontrast' => $highcontrast,
	66	+ ];
	67	+ }
68	68	}

		@@ -43,42 +43,42 @@
		block discarded – undo
43	43
44	44	class Application extends App implements IBootstrap {
45	45
46		- /** @var string */
47		- public const APP_ID = 'accessibility';
	46	+ /** @var string */
	47	+ public const APP_ID = 'accessibility';
48	48
49		- public function __construct() {
50		- parent::__construct(self::APP_ID);
51		- }
	49	+ public function __construct() {
	50	+ parent::__construct(self::APP_ID);
	51	+ }
52	52
53		- public function register(IRegistrationContext $context): void {
54		- $context->registerInitialStateProvider(JSDataService::class);
55		- }
	53	+ public function register(IRegistrationContext $context): void {
	54	+ $context->registerInitialStateProvider(JSDataService::class);
	55	+ }
56	56
57		- public function boot(IBootContext $context): void {
58		- $context->injectFn([$this, 'injectCss']);
59		- }
	57	+ public function boot(IBootContext $context): void {
	58	+ $context->injectFn([$this, 'injectCss']);
	59	+ }
60	60
61		- public function injectCss(IUserSession $userSession,
62		- IConfig $config,
63		- IURLGenerator $urlGenerator) {
64		- // Inject the fake css on all pages if enabled and user is logged
65		- $loggedUser = $userSession->getUser();
66		- if ($loggedUser !== null) {
67		- $userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
68		- // we want to check if any theme or font is enabled.
69		- if (count($userValues) > 0) {
70		- $hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
71		- $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
72		- \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
73		- }
74		- \OCP\Util::addScript('accessibility', 'accessibilityoca');
75		- } else {
76		- $userValues = ['dark'];
	61	+ public function injectCss(IUserSession $userSession,
	62	+ IConfig $config,
	63	+ IURLGenerator $urlGenerator) {
	64	+ // Inject the fake css on all pages if enabled and user is logged
	65	+ $loggedUser = $userSession->getUser();
	66	+ if ($loggedUser !== null) {
	67	+ $userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
	68	+ // we want to check if any theme or font is enabled.
	69	+ if (count($userValues) > 0) {
	70	+ $hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
	71	+ $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
	72	+ \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
	73	+ }
	74	+ \OCP\Util::addScript('accessibility', 'accessibilityoca');
	75	+ } else {
	76	+ $userValues = ['dark'];
77	77
78		- $hash = md5(implode('-', $userValues));
79		- $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
80		- \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
81		- \OCP\Util::addScript('accessibility', 'accessibilityoca');
82		- }
83		- }
	78	+ $hash = md5(implode('-', $userValues));
	79	+ $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
	80	+ \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
	81	+ \OCP\Util::addScript('accessibility', 'accessibilityoca');
	82	+ }
	83	+ }
84	84	}

		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	// we want to check if any theme or font is enabled.
69	69	if (count($userValues) > 0) {
70	70	$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
71		- $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
	71	+ $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
72	72	\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
73	73	}
74	74	\OCP\Util::addScript('accessibility', 'accessibilityoca');
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	$userValues = ['dark'];
77	77
78	78	$hash = md5(implode('-', $userValues));
79		- $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
	79	+ $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
80	80	\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
81	81	\OCP\Util::addScript('accessibility', 'accessibilityoca');
82	82	}

nextcloud / server

Push — master ( c2f62e...dfb274 )

Status

Category

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

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

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