Inspection of "Added functionality to force an admin-defined orde..." - juliushaertl/apporder - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#70)

unknown

created 2019-04-13 20:41 UTC

Status

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

@@ -58,26 +58,26 @@
 block discarded – undo
 		$firstPage = null;
 
 		if ($order !== null && sizeof($order) > 0) {
-			if($hidden !== null && sizeof($hidden) > 0){
-				foreach($order as $app){
-					if(!in_array($app,$hidden)){
+			if ($hidden !== null && sizeof($hidden) > 0) {
+				foreach ($order as $app) {
+					if (!in_array($app, $hidden)) {
 						$firstPage = $app;	
 						break;
 					}
 				}
 			}
-			else{
+			else {
 				$firstPage = $order[0];
 			}
 		} 
-		if($firstPage===null)	{
+		if ($firstPage === null) {
 
 			$appId = 'files';
 
 			if (getenv('front_controller_active') === 'true') {
-				$firstPage = $this->urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
+				$firstPage = $this->urlGenerator->getAbsoluteURL('/apps/'.$appId.'/');
 			} else {
-				$firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
+				$firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/'.$appId.'/');
 			}
 		}
 		return new RedirectResponse($firstPage);

Please login to merge, or discard this patch.

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -65,8 +65,7 @@
 block discarded – undo
 						break;
 					}
 				}
-			}
-			else{
+			} else{
 				$firstPage = $order[0];
 			}
 		} 

Please login to merge, or discard this patch.

lib/Util.php 3 patches

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

@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 		$order_user = $this->appConfig->getUserValue('order', $this->userId);
 		$order_default = $this->appConfig->getAppValue('order');
 		$forced_order = json_decode($this->appConfig->getAppValue('force'));
-                if($forced_order === null) $forced_order = false;
+				if($forced_order === null) $forced_order = false;
 		if ($order_user !== null && $order_user !== "" && !($forced_order)) {
 			$order = $order_user;
 		} else {
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
 		$hidden_user = $this->appConfig->getUserValue('hidden', $this->userId);
 		$hidden_default = $this->appConfig->getAppValue('hidden');
 		$forced_order = json_decode($this->appConfig->getAppValue('force'));
-                if($forced_order === null) $forced_order = false;
+				if($forced_order === null) $forced_order = false;
 		if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) {
 			$hidden = $hidden_user;
 		} else {

Please login to merge, or discard this patch.

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

@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 		$order_user = $this->appConfig->getUserValue('order', $this->userId);
 		$order_default = $this->appConfig->getAppValue('order');
 		$forced_order = json_decode($this->appConfig->getAppValue('force'));
-                if($forced_order === null) $forced_order = false;
+                if ($forced_order === null) $forced_order = false;
 		if ($order_user !== null && $order_user !== "" && !($forced_order)) {
 			$order = $order_user;
 		} else {
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
 		foreach ($nav as $app) {
 			$nav_tmp[$app['href']] = $app;
 		}
-		if(is_array($order)) {
+		if (is_array($order)) {
 			foreach ($order as $app) {
 				if (array_key_exists($app, $nav_tmp)) {
 					$result[$app] = $nav_tmp[$app];
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
 		$hidden_user = $this->appConfig->getUserValue('hidden', $this->userId);
 		$hidden_default = $this->appConfig->getAppValue('hidden');
 		$forced_order = json_decode($this->appConfig->getAppValue('force'));
-                if($forced_order === null) $forced_order = false;
+                if ($forced_order === null) $forced_order = false;
 		if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) {
 			$hidden = $hidden_user;
 		} else {

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -39,7 +39,9 @@  discard block
 block discarded – undo
 		$order_user = $this->appConfig->getUserValue('order', $this->userId);
 		$order_default = $this->appConfig->getAppValue('order');
 		$forced_order = json_decode($this->appConfig->getAppValue('force'));
-                if($forced_order === null) $forced_order = false;
+                if($forced_order === null) {
+                	$forced_order = false;
+                }
 		if ($order_user !== null && $order_user !== "" && !($forced_order)) {
 			$order = $order_user;
 		} else {
@@ -73,7 +75,9 @@  discard block
 block discarded – undo
 		$hidden_user = $this->appConfig->getUserValue('hidden', $this->userId);
 		$hidden_default = $this->appConfig->getAppValue('hidden');
 		$forced_order = json_decode($this->appConfig->getAppValue('force'));
-                if($forced_order === null) $forced_order = false;
+                if($forced_order === null) {
+                	$forced_order = false;
+                }
 		if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) {
 			$hidden = $hidden_user;
 		} else {

Please login to merge, or discard this patch.

lib/Controller/SettingsController.php 3 patches

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

@@ -84,7 +84,7 @@
 block discarded – undo
 			if($hidden === null) $hidden = array();
 		}
 		$force = json_decode($this->appConfig->getAppValue('force'));
-                if($force === null) $force = false;
+				if($force === null) $force = false;
 		return new TemplateResponse(
 			$this->appName,
 			'admin',

Please login to merge, or discard this patch.

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

@@ -55,12 +55,12 @@  discard block
 block discarded – undo
 		// Private API call
 		$navigation = $this->navigationManager->getAll();
 		$order = json_decode($this->appConfig->getAppValue('order'));
-		if($order === null) $order = array();
+		if ($order === null) $order = array();
 		$nav = $this->util->matchOrder($navigation, $order);
 		$hidden = json_decode($this->appConfig->getAppValue('hidden'));
-		if($hidden === null) $hidden = array();
+		if ($hidden === null) $hidden = array();
 		$force = json_decode($this->appConfig->getAppValue('force'));
-		if($force === null) $force = false;
+		if ($force === null) $force = false;
 		return new TemplateResponse(
 			$this->appName,
 			'admin',
@@ -73,18 +73,18 @@  discard block
 block discarded – undo
 		// Private API call
 		$navigation = $this->navigationManager->getAll();
 		$order = json_decode($this->appConfig->getUserValue('order', $this->userId));
-		if($order === null){
+		if ($order === null) {
 			$order = json_decode($this->appConfig->getAppValue('order'));
-			if($order === null) $order = array();
+			if ($order === null) $order = array();
 		}
 		$nav = $this->util->matchOrder($navigation, $order);
-		$hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId));
-		if($hidden === null){
+		$hidden = json_decode($this->appConfig->getUserValue('hidden', $this->userId));
+		if ($hidden === null) {
 			$hidden = json_decode($this->appConfig->getAppValue('hidden'));
-			if($hidden === null) $hidden = array();
+			if ($hidden === null) $hidden = array();
 		}
 		$force = json_decode($this->appConfig->getAppValue('force'));
-                if($force === null) $force = false;
+                if ($force === null) $force = false;
 		return new TemplateResponse(
 			$this->appName,
 			'admin',

Please login to merge, or discard this patch.

Braces +18 added lines, -6 removed lines patch added patch discarded remove patch

@@ -55,12 +55,18 @@  discard block
 block discarded – undo
 		// Private API call
 		$navigation = $this->navigationManager->getAll();
 		$order = json_decode($this->appConfig->getAppValue('order'));
-		if($order === null) $order = array();
+		if($order === null) {
+			$order = array();
+		}
 		$nav = $this->util->matchOrder($navigation, $order);
 		$hidden = json_decode($this->appConfig->getAppValue('hidden'));
-		if($hidden === null) $hidden = array();
+		if($hidden === null) {
+			$hidden = array();
+		}
 		$force = json_decode($this->appConfig->getAppValue('force'));
-		if($force === null) $force = false;
+		if($force === null) {
+			$force = false;
+		}
 		return new TemplateResponse(
 			$this->appName,
 			'admin',
@@ -75,16 +81,22 @@  discard block
 block discarded – undo
 		$order = json_decode($this->appConfig->getUserValue('order', $this->userId));
 		if($order === null){
 			$order = json_decode($this->appConfig->getAppValue('order'));
-			if($order === null) $order = array();
+			if($order === null) {
+				$order = array();
+			}
 		}
 		$nav = $this->util->matchOrder($navigation, $order);
 		$hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId));
 		if($hidden === null){
 			$hidden = json_decode($this->appConfig->getAppValue('hidden'));
-			if($hidden === null) $hidden = array();
+			if($hidden === null) {
+				$hidden = array();
+			}
 		}
 		$force = json_decode($this->appConfig->getAppValue('force'));
-                if($force === null) $force = false;
+                if($force === null) {
+                	$force = false;
+                }
 		return new TemplateResponse(
 			$this->appName,
 			'admin',

Please login to merge, or discard this patch.

		@@ -58,26 +58,26 @@
		block discarded – undo
58	58	$firstPage = null;
59	59
60	60	if ($order !== null && sizeof($order) > 0) {
61		- if($hidden !== null && sizeof($hidden) > 0){
62		- foreach($order as $app){
63		- if(!in_array($app,$hidden)){
	61	+ if ($hidden !== null && sizeof($hidden) > 0) {
	62	+ foreach ($order as $app) {
	63	+ if (!in_array($app, $hidden)) {
64	64	$firstPage = $app;
65	65	break;
66	66	}
67	67	}
68	68	}
69		- else{
	69	+ else {
70	70	$firstPage = $order[0];
71	71	}
72	72	}
73		- if($firstPage===null) {
	73	+ if ($firstPage === null) {
74	74
75	75	$appId = 'files';
76	76
77	77	if (getenv('front_controller_active') === 'true') {
78		- $firstPage = $this->urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
	78	+ $firstPage = $this->urlGenerator->getAbsoluteURL('/apps/'.$appId.'/');
79	79	} else {
80		- $firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
	80	+ $firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/'.$appId.'/');
81	81	}
82	82	}
83	83	return new RedirectResponse($firstPage);

		@@ -84,7 +84,7 @@
		block discarded – undo
84	84	if($hidden === null) $hidden = array();
85	85	}
86	86	$force = json_decode($this->appConfig->getAppValue('force'));
87		- if($force === null) $force = false;
	87	+ if($force === null) $force = false;
88	88	return new TemplateResponse(
89	89	$this->appName,
90	90	'admin',

		@@ -65,8 +65,7 @@
		block discarded – undo
65	65	break;
66	66	}
67	67	}
68		- }
69		- else{
	68	+ } else{
70	69	$firstPage = $order[0];
71	70	}
72	71	}

		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	$order_user = $this->appConfig->getUserValue('order', $this->userId);
40	40	$order_default = $this->appConfig->getAppValue('order');
41	41	$forced_order = json_decode($this->appConfig->getAppValue('force'));
42		- if($forced_order === null) $forced_order = false;
	42	+ if($forced_order === null) $forced_order = false;
43	43	if ($order_user !== null && $order_user !== "" && !($forced_order)) {
44	44	$order = $order_user;
45	45	} else {
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	$hidden_user = $this->appConfig->getUserValue('hidden', $this->userId);
74	74	$hidden_default = $this->appConfig->getAppValue('hidden');
75	75	$forced_order = json_decode($this->appConfig->getAppValue('force'));
76		- if($forced_order === null) $forced_order = false;
	76	+ if($forced_order === null) $forced_order = false;
77	77	if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) {
78	78	$hidden = $hidden_user;
79	79	} else {

		@@ -39,7 +39,9 @@ discard block
		block discarded – undo
39	39	$order_user = $this->appConfig->getUserValue('order', $this->userId);
40	40	$order_default = $this->appConfig->getAppValue('order');
41	41	$forced_order = json_decode($this->appConfig->getAppValue('force'));
42		- if($forced_order === null) $forced_order = false;
	42	+ if($forced_order === null) {
	43	+ $forced_order = false;
	44	+ }
43	45	if ($order_user !== null && $order_user !== "" && !($forced_order)) {
44	46	$order = $order_user;
45	47	} else {
		@@ -73,7 +75,9 @@ discard block
		block discarded – undo
73	75	$hidden_user = $this->appConfig->getUserValue('hidden', $this->userId);
74	76	$hidden_default = $this->appConfig->getAppValue('hidden');
75	77	$forced_order = json_decode($this->appConfig->getAppValue('force'));
76		- if($forced_order === null) $forced_order = false;
	78	+ if($forced_order === null) {
	79	+ $forced_order = false;
	80	+ }
77	81	if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) {
78	82	$hidden = $hidden_user;
79	83	} else {

		@@ -55,12 +55,12 @@ discard block
		block discarded – undo
55	55	// Private API call
56	56	$navigation = $this->navigationManager->getAll();
57	57	$order = json_decode($this->appConfig->getAppValue('order'));
58		- if($order === null) $order = array();
	58	+ if ($order === null) $order = array();
59	59	$nav = $this->util->matchOrder($navigation, $order);
60	60	$hidden = json_decode($this->appConfig->getAppValue('hidden'));
61		- if($hidden === null) $hidden = array();
	61	+ if ($hidden === null) $hidden = array();
62	62	$force = json_decode($this->appConfig->getAppValue('force'));
63		- if($force === null) $force = false;
	63	+ if ($force === null) $force = false;
64	64	return new TemplateResponse(
65	65	$this->appName,
66	66	'admin',
		@@ -73,18 +73,18 @@ discard block
		block discarded – undo
73	73	// Private API call
74	74	$navigation = $this->navigationManager->getAll();
75	75	$order = json_decode($this->appConfig->getUserValue('order', $this->userId));
76		- if($order === null){
	76	+ if ($order === null) {
77	77	$order = json_decode($this->appConfig->getAppValue('order'));
78		- if($order === null) $order = array();
	78	+ if ($order === null) $order = array();
79	79	}
80	80	$nav = $this->util->matchOrder($navigation, $order);
81		- $hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId));
82		- if($hidden === null){
	81	+ $hidden = json_decode($this->appConfig->getUserValue('hidden', $this->userId));
	82	+ if ($hidden === null) {
83	83	$hidden = json_decode($this->appConfig->getAppValue('hidden'));
84		- if($hidden === null) $hidden = array();
	84	+ if ($hidden === null) $hidden = array();
85	85	}
86	86	$force = json_decode($this->appConfig->getAppValue('force'));
87		- if($force === null) $force = false;
	87	+ if ($force === null) $force = false;
88	88	return new TemplateResponse(
89	89	$this->appName,
90	90	'admin',

		@@ -55,12 +55,18 @@ discard block
		block discarded – undo
55	55	// Private API call
56	56	$navigation = $this->navigationManager->getAll();
57	57	$order = json_decode($this->appConfig->getAppValue('order'));
58		- if($order === null) $order = array();
	58	+ if($order === null) {
	59	+ $order = array();
	60	+ }
59	61	$nav = $this->util->matchOrder($navigation, $order);
60	62	$hidden = json_decode($this->appConfig->getAppValue('hidden'));
61		- if($hidden === null) $hidden = array();
	63	+ if($hidden === null) {
	64	+ $hidden = array();
	65	+ }
62	66	$force = json_decode($this->appConfig->getAppValue('force'));
63		- if($force === null) $force = false;
	67	+ if($force === null) {
	68	+ $force = false;
	69	+ }
64	70	return new TemplateResponse(
65	71	$this->appName,
66	72	'admin',
		@@ -75,16 +81,22 @@ discard block
		block discarded – undo
75	81	$order = json_decode($this->appConfig->getUserValue('order', $this->userId));
76	82	if($order === null){
77	83	$order = json_decode($this->appConfig->getAppValue('order'));
78		- if($order === null) $order = array();
	84	+ if($order === null) {
	85	+ $order = array();
	86	+ }
79	87	}
80	88	$nav = $this->util->matchOrder($navigation, $order);
81	89	$hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId));
82	90	if($hidden === null){
83	91	$hidden = json_decode($this->appConfig->getAppValue('hidden'));
84		- if($hidden === null) $hidden = array();
	92	+ if($hidden === null) {
	93	+ $hidden = array();
	94	+ }
85	95	}
86	96	$force = json_decode($this->appConfig->getAppValue('force'));
87		- if($force === null) $force = false;
	97	+ if($force === null) {
	98	+ $force = false;
	99	+ }
88	100	return new TemplateResponse(
89	101	$this->appName,
90	102	'admin',

juliushaertl / apporder

Pull Request — master (#70)

Status

Category

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

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

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

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

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

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

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

Braces +18 added lines, -6 removed lines patch added patch discarded remove patch