Inspection of "Extracted CLI error handling to it's own template" - jenskooij/cloudcontrol - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — develop ( 1bfb65...a01f89 )

by Jens

created 2017-03-13 12:53 UTC

Status

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

@@ -31,11 +31,11 @@  discard block
 block discarded – undo
  */
 function shutdownHandler () {
 	$error = error_get_last(); 
-    if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-        errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
-    }elseif ($error['type'] == 1) {
-        dump($error);
-    }
+	if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
+		errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
+	}elseif ($error['type'] == 1) {
+		dump($error);
+	}
 }
 
 /**
@@ -49,28 +49,28 @@  discard block
 block discarded – undo
 	$jsonErrorNr = json_last_error();
 	$errstr = '';
 	switch ($jsonErrorNr) {
-        case JSON_ERROR_NONE:
-            $errstr .= ' - No errors' . PHP_EOL;
-        break;
-        case JSON_ERROR_DEPTH:
-            $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
-        break;
-        case JSON_ERROR_STATE_MISMATCH:
-            $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
-        break;
-        case JSON_ERROR_CTRL_CHAR:
-            $errstr .= ' - Unexpected control character found' . PHP_EOL;
-        break;
-        case JSON_ERROR_SYNTAX:
-            $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
-        break;
-        case JSON_ERROR_UTF8:
-            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
-        break;
-        default:
-            $errstr = ' - Unknown error' . PHP_EOL;
-        break;
-    }
+		case JSON_ERROR_NONE:
+			$errstr .= ' - No errors' . PHP_EOL;
+		break;
+		case JSON_ERROR_DEPTH:
+			$errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
+		break;
+		case JSON_ERROR_STATE_MISMATCH:
+			$errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
+		break;
+		case JSON_ERROR_CTRL_CHAR:
+			$errstr .= ' - Unexpected control character found' . PHP_EOL;
+		break;
+		case JSON_ERROR_SYNTAX:
+			$errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
+		break;
+		case JSON_ERROR_UTF8:
+			$errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
+		break;
+		default:
+			$errstr = ' - Unknown error' . PHP_EOL;
+		break;
+	}
 	errorHandler ($jsonErrorNr, $errstr, $file, $line);
 }
 
@@ -85,75 +85,75 @@  discard block
 block discarded – undo
  * @param string $httpHeader
  */
 function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
-    if (ob_get_contents()) ob_end_clean();
+	if (ob_get_contents()) ob_end_clean();
 
-    if (canShowError()) {
-        $file_lines = file_exists($file) ? file($file) : array();
-        $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
-        $lines = array();
+	if (canShowError()) {
+		$file_lines = file_exists($file) ? file($file) : array();
+		$range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
+		$lines = array();
 
-        foreach ($range as $line_number) {
-            if(isset($file_lines[$line_number-1])) {
-                $lines[$line_number] = $file_lines[$line_number-1];
-            }
-        }
+		foreach ($range as $line_number) {
+			if(isset($file_lines[$line_number-1])) {
+				$lines[$line_number] = $file_lines[$line_number-1];
+			}
+		}
 
-        $error = array(
-            'message' 		=> $message,
-            'file' 			=> $file,
-            'line' 			=> $line,
-            'code' 			=> $code,
-            'lines' 		=> $lines,
-            'trace' 		=> $trace,
-            'httpHeader' 	=> $httpHeader,
-        );
+		$error = array(
+			'message' 		=> $message,
+			'file' 			=> $file,
+			'line' 			=> $line,
+			'code' 			=> $code,
+			'lines' 		=> $lines,
+			'trace' 		=> $trace,
+			'httpHeader' 	=> $httpHeader,
+		);
 
-        if (PHP_SAPI === 'cli') {
-            renderCliException($message, $file, $line, $trace, $lines);
-        }
+		if (PHP_SAPI === 'cli') {
+			renderCliException($message, $file, $line, $trace, $lines);
+		}
 
-        if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
-            header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-            include(realpath(__DIR__) . '/errorviewdetailed.php');
-        } else {
-            header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-            header('Content-type: application/json');
-            die(json_encode($error));
-        }
-        exit;
-    } else {
-        header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-        header('X-Error-Message: ' . $message);
-        header('X-Error-File: ' . $file);
-        header('X-Error-Line: ' . $line);
-        if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
-            include(realpath(__DIR__) . '/errorviewcompact.php');
-        } else {
-            header('Content-type: application/json');
-            die(json_encode('An error occured.'));
-        }
-    }
+		if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
+			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+			include(realpath(__DIR__) . '/errorviewdetailed.php');
+		} else {
+			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+			header('Content-type: application/json');
+			die(json_encode($error));
+		}
+		exit;
+	} else {
+		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+		header('X-Error-Message: ' . $message);
+		header('X-Error-File: ' . $file);
+		header('X-Error-Line: ' . $line);
+		if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
+			include(realpath(__DIR__) . '/errorviewcompact.php');
+		} else {
+			header('Content-type: application/json');
+			die(json_encode('An error occured.'));
+		}
+	}
 }
 
 function canShowError()
 {
-    if (PHP_SAPI === 'cli') {
-        return true;
-    }
-    if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
-        $config = file_get_contents('../config.json');
-        $config = json_decode($config);
-        if (isset($config->showErrorsToAll)) {
-            return $config->showErrorsToAll;
-        }
-    } else {
-        return true;
-    }
+	if (PHP_SAPI === 'cli') {
+		return true;
+	}
+	if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
+		$config = file_get_contents('../config.json');
+		$config = json_decode($config);
+		if (isset($config->showErrorsToAll)) {
+			return $config->showErrorsToAll;
+		}
+	} else {
+		return true;
+	}
 }
 
 function renderCliException($message, $file, $line, $trace, $lines)
 {
 	if (ob_get_contents()) ob_end_clean();
 	include(realpath(__DIR__) . '/errorviewcli.php');
-    exit;
+	exit;
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -31,11 +31,11 @@ discard block
		block discarded – undo
31	31	*/
32	32	function shutdownHandler () {
33	33	$error = error_get_last();
34		- if (isset($error['type'], $error['message'], $error['file'], $error['line'])) {
35		- errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
36		- }elseif ($error['type'] == 1) {
37		- dump($error);
38		- }
	34	+ if (isset($error['type'], $error['message'], $error['file'], $error['line'])) {
	35	+ errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
	36	+ }elseif ($error['type'] == 1) {
	37	+ dump($error);
	38	+ }
39	39	}
40	40
41	41	/**
		@@ -49,28 +49,28 @@ discard block
		block discarded – undo
49	49	$jsonErrorNr = json_last_error();
50	50	$errstr = '';
51	51	switch ($jsonErrorNr) {
52		- case JSON_ERROR_NONE:
53		- $errstr .= ' - No errors' . PHP_EOL;
54		- break;
55		- case JSON_ERROR_DEPTH:
56		- $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
57		- break;
58		- case JSON_ERROR_STATE_MISMATCH:
59		- $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
60		- break;
61		- case JSON_ERROR_CTRL_CHAR:
62		- $errstr .= ' - Unexpected control character found' . PHP_EOL;
63		- break;
64		- case JSON_ERROR_SYNTAX:
65		- $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
66		- break;
67		- case JSON_ERROR_UTF8:
68		- $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
69		- break;
70		- default:
71		- $errstr = ' - Unknown error' . PHP_EOL;
72		- break;
73		- }
	52	+ case JSON_ERROR_NONE:
	53	+ $errstr .= ' - No errors' . PHP_EOL;
	54	+ break;
	55	+ case JSON_ERROR_DEPTH:
	56	+ $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
	57	+ break;
	58	+ case JSON_ERROR_STATE_MISMATCH:
	59	+ $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
	60	+ break;
	61	+ case JSON_ERROR_CTRL_CHAR:
	62	+ $errstr .= ' - Unexpected control character found' . PHP_EOL;
	63	+ break;
	64	+ case JSON_ERROR_SYNTAX:
	65	+ $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
	66	+ break;
	67	+ case JSON_ERROR_UTF8:
	68	+ $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
	69	+ break;
	70	+ default:
	71	+ $errstr = ' - Unknown error' . PHP_EOL;
	72	+ break;
	73	+ }
74	74	errorHandler ($jsonErrorNr, $errstr, $file, $line);
75	75	}
76	76
		@@ -85,75 +85,75 @@ discard block
		block discarded – undo
85	85	* @param string $httpHeader
86	86	*/
87	87	function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
88		- if (ob_get_contents()) ob_end_clean();
	88	+ if (ob_get_contents()) ob_end_clean();
89	89
90		- if (canShowError()) {
91		- $file_lines = file_exists($file) ? file($file) : array();
92		- $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
93		- $lines = array();
	90	+ if (canShowError()) {
	91	+ $file_lines = file_exists($file) ? file($file) : array();
	92	+ $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
	93	+ $lines = array();
94	94
95		- foreach ($range as $line_number) {
96		- if(isset($file_lines[$line_number-1])) {
97		- $lines[$line_number] = $file_lines[$line_number-1];
98		- }
99		- }
	95	+ foreach ($range as $line_number) {
	96	+ if(isset($file_lines[$line_number-1])) {
	97	+ $lines[$line_number] = $file_lines[$line_number-1];
	98	+ }
	99	+ }
100	100
101		- $error = array(
102		- 'message' => $message,
103		- 'file' => $file,
104		- 'line' => $line,
105		- 'code' => $code,
106		- 'lines' => $lines,
107		- 'trace' => $trace,
108		- 'httpHeader' => $httpHeader,
109		- );
	101	+ $error = array(
	102	+ 'message' => $message,
	103	+ 'file' => $file,
	104	+ 'line' => $line,
	105	+ 'code' => $code,
	106	+ 'lines' => $lines,
	107	+ 'trace' => $trace,
	108	+ 'httpHeader' => $httpHeader,
	109	+ );
110	110
111		- if (PHP_SAPI === 'cli') {
112		- renderCliException($message, $file, $line, $trace, $lines);
113		- }
	111	+ if (PHP_SAPI === 'cli') {
	112	+ renderCliException($message, $file, $line, $trace, $lines);
	113	+ }
114	114
115		- if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
116		- header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
117		- include(realpath(__DIR__) . '/errorviewdetailed.php');
118		- } else {
119		- header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
120		- header('Content-type: application/json');
121		- die(json_encode($error));
122		- }
123		- exit;
124		- } else {
125		- header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
126		- header('X-Error-Message: ' . $message);
127		- header('X-Error-File: ' . $file);
128		- header('X-Error-Line: ' . $line);
129		- if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
130		- include(realpath(__DIR__) . '/errorviewcompact.php');
131		- } else {
132		- header('Content-type: application/json');
133		- die(json_encode('An error occured.'));
134		- }
135		- }
	115	+ if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
	116	+ header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
	117	+ include(realpath(__DIR__) . '/errorviewdetailed.php');
	118	+ } else {
	119	+ header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
	120	+ header('Content-type: application/json');
	121	+ die(json_encode($error));
	122	+ }
	123	+ exit;
	124	+ } else {
	125	+ header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
	126	+ header('X-Error-Message: ' . $message);
	127	+ header('X-Error-File: ' . $file);
	128	+ header('X-Error-Line: ' . $line);
	129	+ if (file_exists(realpath(__DIR__) . '/errorviewcompact.php')) {
	130	+ include(realpath(__DIR__) . '/errorviewcompact.php');
	131	+ } else {
	132	+ header('Content-type: application/json');
	133	+ die(json_encode('An error occured.'));
	134	+ }
	135	+ }
136	136	}
137	137
138	138	function canShowError()
139	139	{
140		- if (PHP_SAPI === 'cli') {
141		- return true;
142		- }
143		- if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
144		- $config = file_get_contents('../config.json');
145		- $config = json_decode($config);
146		- if (isset($config->showErrorsToAll)) {
147		- return $config->showErrorsToAll;
148		- }
149		- } else {
150		- return true;
151		- }
	140	+ if (PHP_SAPI === 'cli') {
	141	+ return true;
	142	+ }
	143	+ if (file_exists('../config.json') && !isset($_SESSION['cloudcontrol'])) {
	144	+ $config = file_get_contents('../config.json');
	145	+ $config = json_decode($config);
	146	+ if (isset($config->showErrorsToAll)) {
	147	+ return $config->showErrorsToAll;
	148	+ }
	149	+ } else {
	150	+ return true;
	151	+ }
152	152	}
153	153
154	154	function renderCliException($message, $file, $line, $trace, $lines)
155	155	{
156	156	if (ob_get_contents()) ob_end_clean();
157	157	include(realpath(__DIR__) . '/errorviewcli.php');
158		- exit;
	158	+ exit;
159	159	}
160	160	\ No newline at end of file

jenskooij / cloudcontrol

Push — develop ( 1bfb65...a01f89 )

Status

Category

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