Passed
Push — develop ( 1bfb65...a01f89 )
by Jens
02:58
created
cloudcontrol/library/storage/Repository.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -105,13 +105,13 @@  discard block
 block discarded – undo
105 105
             if (in_array($name, $this->fileBasedSubsets)) {
106 106
                 return $this->$name;
107 107
             } else {
108
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
108
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
109 109
             }
110 110
         } else {
111 111
             if (in_array($name, $this->fileBasedSubsets)) {
112 112
                 return $this->loadSubset($name);
113 113
             } else {
114
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
114
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
115 115
             }
116 116
         }
117 117
     }
@@ -126,10 +126,10 @@  discard block
 block discarded – undo
126 126
     {
127 127
         if (in_array($name, $this->fileBasedSubsets)) {
128 128
             $this->$name = $value;
129
-            $changes = $name . 'Changes';
129
+            $changes = $name.'Changes';
130 130
             $this->$changes = true;
131 131
         } else {
132
-            throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
132
+            throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>');
133 133
         }
134 134
     }
135 135
 
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
     protected function saveSubset($subset)
156 156
     {
157 157
         $json = json_encode($this->$subset);
158
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
158
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
159 159
         file_put_contents($subsetStoragePath, $json);
160
-        $changes = $subset . 'Changes';
160
+        $changes = $subset.'Changes';
161 161
         $this->$changes = false;
162 162
     }
163 163
 
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
      */
169 169
     protected function loadSubset($subset)
170 170
     {
171
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
171
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
172 172
         $json = file_get_contents($subsetStoragePath);
173 173
         $json = json_decode($json);
174 174
         $this->$subset = $json;
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
     public function getContentDbHandle()
217 217
     {
218 218
         if ($this->contentDbHandle === null) {
219
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
219
+            $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db');
220 220
         }
221 221
         return $this->contentDbHandle;
222 222
     }
@@ -239,14 +239,14 @@  discard block
 block discarded – undo
239 239
     public function getDocumentsByPath($folderPath)
240 240
     {
241 241
         $db = $this->getContentDbHandle();
242
-        $folderPathWithWildcard = $folderPath . '%';
242
+        $folderPathWithWildcard = $folderPath.'%';
243 243
 
244 244
         $stmt = $this->getDbStatement('
245 245
             SELECT *
246 246
               FROM documents
247
-             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
248
-               AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
249
-               AND path != ' . $db->quote($folderPath) . '
247
+             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard).'
248
+               AND substr(`path`, ' . (strlen($folderPath) + 1).') NOT LIKE "%/%"
249
+               AND path != ' . $db->quote($folderPath).'
250 250
           ORDER BY `type` DESC, `path` ASC
251 251
         ');
252 252
 
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
         $document = $this->fetchDocument('
291 291
             SELECT *
292 292
               FROM documents
293
-             WHERE path = ' . $db->quote($path) . '
293
+             WHERE path = ' . $db->quote($path).'
294 294
         ');
295 295
         if ($document instanceof Document && $document->type === 'folder') {
296 296
             $document->dbHandle = $db;
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 			  FROM documents
311 311
 		');
312 312
 		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
313
-		if (!is_array($result )) {
313
+		if (!is_array($result)) {
314 314
 			return 0;
315 315
 		}
316 316
 		return intval(current($result));
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
         if ($stmt === false) {
354 354
             $errorInfo = $db->errorInfo();
355 355
             $errorMsg = $errorInfo[2];
356
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
356
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
357 357
         }
358 358
         return $stmt;
359 359
     }
@@ -383,19 +383,19 @@  discard block
 block discarded – undo
383 383
         $stmt = $this->getDbStatement('
384 384
             INSERT OR REPLACE INTO documents (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
385 385
             VALUES(
386
-              ' . $db->quote($documentObject->path) . ',
387
-              ' . $db->quote($documentObject->title) . ',
388
-              ' . $db->quote($documentObject->slug) . ',
389
-              ' . $db->quote($documentObject->type) . ',
390
-              ' . $db->quote($documentObject->documentType) . ',
391
-              ' . $db->quote($documentObject->documentTypeSlug) . ',
392
-              ' . $db->quote($documentObject->state) . ',
393
-              ' . $db->quote($documentObject->lastModificationDate) . ',
394
-              ' . $db->quote($documentObject->creationDate) . ',
395
-              ' . $db->quote($documentObject->lastModifiedBy) . ',
396
-              ' . $db->quote(json_encode($documentObject->fields)) . ',
397
-              ' . $db->quote(json_encode($documentObject->bricks)) . ',
398
-              ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
386
+              ' . $db->quote($documentObject->path).',
387
+              ' . $db->quote($documentObject->title).',
388
+              ' . $db->quote($documentObject->slug).',
389
+              ' . $db->quote($documentObject->type).',
390
+              ' . $db->quote($documentObject->documentType).',
391
+              ' . $db->quote($documentObject->documentTypeSlug).',
392
+              ' . $db->quote($documentObject->state).',
393
+              ' . $db->quote($documentObject->lastModificationDate).',
394
+              ' . $db->quote($documentObject->creationDate).',
395
+              ' . $db->quote($documentObject->lastModifiedBy).',
396
+              ' . $db->quote(json_encode($documentObject->fields)).',
397
+              ' . $db->quote(json_encode($documentObject->bricks)).',
398
+              ' . $db->quote(json_encode($documentObject->dynamicBricks)).'
399 399
             )
400 400
         ');
401 401
         $result = $stmt->execute();
@@ -416,16 +416,16 @@  discard block
 block discarded – undo
416 416
             if ($documentToDelete->type == 'document') {
417 417
                 $stmt = $this->getDbStatement('
418 418
                     DELETE FROM documents
419
-                          WHERE path = ' . $db->quote($path) . '
419
+                          WHERE path = ' . $db->quote($path).'
420 420
                 ');
421 421
                 $stmt->execute();
422 422
             } elseif ($documentToDelete->type == 'folder') {
423
-                $folderPathWithWildcard = $path . '%';
423
+                $folderPathWithWildcard = $path.'%';
424 424
                 $stmt = $this->getDbStatement('
425 425
                     DELETE FROM documents
426
-                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
427
-                            AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
428
-                            OR path = ' . $db->quote($path) . '
426
+                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).'
427
+                            AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/")
428
+                            OR path = ' . $db->quote($path).'
429 429
                 ');
430 430
                 $stmt->execute();
431 431
             }
Please login to merge, or discard this patch.
cloudcontrol/library/storage/Document.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             }
48 48
         } elseif ($name === 'content') {
49 49
             if ($this->dbHandle === null) {
50
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
50
+                throw new \Exception('Document doesnt have a dbHandle handle. (path: '.$this->path.')');
51 51
             } else {
52 52
                 if ($this->content === null) {
53 53
                     $this->getContent();
@@ -76,19 +76,19 @@  discard block
 block discarded – undo
76 76
      */
77 77
     protected function getContent()
78 78
     {
79
-        $folderPathWithWildcard = $this->path . '%';
79
+        $folderPathWithWildcard = $this->path.'%';
80 80
         $sql = '    SELECT *
81 81
                       FROM documents
82
-                     WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard) . '
83
-                       AND substr(`path`, ' . (strlen($this->path) + 2) . ') NOT LIKE "%/%"
84
-                       AND substr(`path`, ' . (strlen($this->path) + 1) . ', 1) = "/"
85
-                       AND path != ' . $this->dbHandle->quote($this->path) . '
82
+                     WHERE `path` LIKE ' . $this->dbHandle->quote($folderPathWithWildcard).'
83
+                       AND substr(`path`, ' . (strlen($this->path) + 2).') NOT LIKE "%/%"
84
+                       AND substr(`path`, ' . (strlen($this->path) + 1).', 1) = "/"
85
+                       AND path != ' . $this->dbHandle->quote($this->path).'
86 86
                     ';
87 87
         $stmt = $this->dbHandle->query($sql);
88 88
         if ($stmt === false) {
89 89
             $errorInfo = $this->dbHandle->errorInfo();
90 90
             $errorMsg = $errorInfo[2];
91
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
91
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
92 92
         }
93 93
         $contents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\storage\Document');
94 94
         foreach ($contents as $key => $document) {
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	 */
106 106
 	function __toString()
107 107
 	{
108
-		return 'Document:' . $this->title;
108
+		return 'Document:'.$this->title;
109 109
 	}
110 110
 
111 111
 
Please login to merge, or discard this patch.
cloudcontrol/library/search/filters/DutchStopWords.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,5 +10,5 @@
 block discarded – undo
10 10
 
11 11
 class DutchStopWords extends StopWordsFilter
12 12
 {
13
-	protected $stopWords = array('aan','af','al','alles','als','altijd','andere','ben','bij','daar','dan','dat','de','der','deze','die','dit','doch','doen','door','doorgaans','dus','een','eens','en','er','ge','geen','geweest','haar','had','heb','hebben','heeft','hem','het','hier','hij','hoe','hun','iemand','iets','ik','in','is','ja','je','kan','kon','kunnen','maar','me','meer','men','met','mij','mijn','moet','na','naar','niet','niets','nog','nu','of','om','omdat','ons','ook','op','over','reeds','te','tegen','toch','toen','tot','u','uit','uw','van','veel','voor','want','waren','was','wat','we','wel','werd','wezen','wie','wij','wil','worden','zal','ze','zei','zelf','zich','zij','zijn','zo','zodat','zonder','zou');
13
+	protected $stopWords = array('aan', 'af', 'al', 'alles', 'als', 'altijd', 'andere', 'ben', 'bij', 'daar', 'dan', 'dat', 'de', 'der', 'deze', 'die', 'dit', 'doch', 'doen', 'door', 'doorgaans', 'dus', 'een', 'eens', 'en', 'er', 'ge', 'geen', 'geweest', 'haar', 'had', 'heb', 'hebben', 'heeft', 'hem', 'het', 'hier', 'hij', 'hoe', 'hun', 'iemand', 'iets', 'ik', 'in', 'is', 'ja', 'je', 'kan', 'kon', 'kunnen', 'maar', 'me', 'meer', 'men', 'met', 'mij', 'mijn', 'moet', 'na', 'naar', 'niet', 'niets', 'nog', 'nu', 'of', 'om', 'omdat', 'ons', 'ook', 'op', 'over', 'reeds', 'te', 'tegen', 'toch', 'toen', 'tot', 'u', 'uit', 'uw', 'van', 'veel', 'voor', 'want', 'waren', 'was', 'wat', 'we', 'wel', 'werd', 'wezen', 'wie', 'wij', 'wil', 'worden', 'zal', 'ze', 'zei', 'zelf', 'zich', 'zij', 'zijn', 'zo', 'zodat', 'zonder', 'zou');
14 14
 }
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
cloudcontrol/library/search/Search.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -79,13 +79,13 @@  discard block
 block discarded – undo
79 79
 		if (!$stmt = $db->query($sql)) {
80 80
 			$errorInfo = $db->errorInfo();
81 81
 			$errorMsg = $errorInfo[2];
82
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
82
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
83 83
 		}
84 84
 		$result = $stmt->fetch(\PDO::FETCH_COLUMN);
85 85
 		if (false === $result) {
86 86
 			$errorInfo = $db->errorInfo();
87 87
 			$errorMsg = $errorInfo[2];
88
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
88
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
89 89
 		}
90 90
 		return intval($result);
91 91
 	}
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 	protected function applyFilters($tokens)
119 119
 	{
120 120
 		foreach ($this->filters as $filterName) {
121
-			$filterClassName = '\library\search\filters\\' . $filterName;
121
+			$filterClassName = '\library\search\filters\\'.$filterName;
122 122
 			$filter = new $filterClassName($tokens);
123 123
 			$tokens = $filter->getFilterResults();
124 124
 		}
@@ -154,13 +154,13 @@  discard block
 block discarded – undo
154 154
 		  GROUP BY term_frequency.documentPath, term_frequency.term
155 155
 		  ORDER BY score DESC
156 156
 		';
157
-		if(!$stmt = $db->prepare($sql)) {
158
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
157
+		if (!$stmt = $db->prepare($sql)) {
158
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
159 159
 		}
160 160
 		$stmt->bindValue(':query', $token);
161 161
 		$stmt->bindValue(':queryNorm', $queryNorm);
162 162
 		if (!$stmt->execute()) {
163
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
163
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
164 164
 		}
165 165
 		return $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\search\results\SearchResult');
166 166
 	}
@@ -216,13 +216,13 @@  discard block
 block discarded – undo
216 216
 		$sql = '
217 217
 			SELECT (1 / sqrt(SUM(inverseDocumentFrequency))) as queryNorm
218 218
 			  FROM inverse_document_frequency
219
-			 WHERE term IN (' . $terms . ') 
219
+			 WHERE term IN (' . $terms.') 
220 220
 		';
221
-		if(!$stmt = $db->prepare($sql)) {
222
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
221
+		if (!$stmt = $db->prepare($sql)) {
222
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
223 223
 		}
224 224
 		if (!$stmt->execute()) {
225
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
225
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
226 226
 		}
227 227
 		$result = $stmt->fetch(\PDO::FETCH_OBJ);
228 228
 		return $result->queryNorm == null ? 1 : $result->queryNorm;
@@ -272,11 +272,11 @@  discard block
 block discarded – undo
272 272
 			';
273 273
 			$stmt = $db->prepare($sql);
274 274
 			if ($stmt === false) {
275
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
275
+				throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
276 276
 			}
277 277
 			$stmt->bindValue(':token', $token);
278 278
 			if (($stmt === false) | (!$stmt->execute())) {
279
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
279
+				throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
280 280
 			}
281 281
 			$result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\library\search\results\SearchSuggestion');
282 282
 			$allResults = array_merge($result, $allResults);
Please login to merge, or discard this patch.
cloudcontrol/library/components/cms/SearchRouting.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	}
74 74
 
75 75
 	private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') {
76
-		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
76
+		header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
77 77
 		header('Content-type: application/json');
78 78
 		die(json_encode($obj));
79 79
 	}
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 			$indexer->replaceOldIndex();
106 106
 			$this->showJson('done');
107 107
 		} else {
108
-			$this->showJson('Invalid step: ' . $step . '.', 'HTTP/1.0 500 Internal Server Error');
108
+			$this->showJson('Invalid step: '.$step.'.', 'HTTP/1.0 500 Internal Server Error');
109 109
 		}
110 110
 	}
111 111
 }
112 112
\ No newline at end of file
Please login to merge, or discard this patch.
cloudcontrol/library/cc/errorviewcli.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -2,21 +2,21 @@  discard block
 block discarded – undo
2 2
 | THE FOLLOWING ERROR OCCURED                                                                                                                  |
3 3
 ------------------------------------------------------------------------------------------------------------------------------------------------
4 4
 
5
- <?php echo $message . PHP_EOL; ?>
5
+ <?php echo $message.PHP_EOL; ?>
6 6
 
7 7
 ------------------------------------------------------------------------------------------------------------------------------------------------
8 8
 | IN FILE                                                                                                                                      |
9 9
 ------------------------------------------------------------------------------------------------------------------------------------------------
10 10
 
11
- <?php echo $file . ':' . $line . PHP_EOL; ?>
11
+ <?php echo $file.':'.$line.PHP_EOL; ?>
12 12
 
13 13
 ------------------------------------------------------------------------------------------------------------------------------------------------
14 14
 | CONTENTS OF THE FILE                                                                                                                         |
15 15
 ------------------------------------------------------------------------------------------------------------------------------------------------
16 16
 
17 17
 <?php
18
-foreach($lines as $nr => $currentLine) {
19
-	echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
18
+foreach ($lines as $nr => $currentLine) {
19
+	echo ($nr == $line ? '* ' : '  ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine;
20 20
 }
21 21
 ?>
22 22
 
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
25 25
 ------------------------------------------------------------------------------------------------------------------------------------------------
26 26
 
27 27
 <?php
28
-foreach($trace as $row) {
29
-	echo (isset($row['file']) ? basename($row['file']) : '') . ':'
30
-		. (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
31
-		. (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
32
-		. (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
33
-		. (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
28
+foreach ($trace as $row) {
29
+	echo (isset($row['file']) ? basename($row['file']) : '').':'
30
+		. (isset($row['line']) ? $row['line'] : '')."\t\t\t"
31
+		. (isset($row['class']) ? $row['class'] : ' ')."\t\t\t"
32
+		. (isset($row['type']) ? $row['type'] : ' ')."\t\t\t"
33
+		. (isset($row['function']) ? $row['function'] : ' ').PHP_EOL;
34 34
 }
35 35
 ?>
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
cloudcontrol/library/cc/errorhandler.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -9,8 +9,8 @@  discard block
 block discarded – undo
9 9
  *
10 10
  * @param $e
11 11
  */
12
-function exceptionHandler ($e) {
13
-	renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace());
12
+function exceptionHandler($e) {
13
+	renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace());
14 14
 }
15 15
 
16 16
 /**
@@ -21,18 +21,18 @@  discard block
 block discarded – undo
21 21
  * @param $errfile
22 22
  * @param $errline
23 23
  */
24
-function errorHandler ($errno, $errstr, $errfile, $errline) {
25
-	renderError($errstr,$errfile,$errline,$errno,debug_backtrace());
24
+function errorHandler($errno, $errstr, $errfile, $errline) {
25
+	renderError($errstr, $errfile, $errline, $errno, debug_backtrace());
26 26
 }
27 27
 
28 28
 /**
29 29
  * When an error occurs that kills the process, still try
30 30
  * to show it using a shutdownHandler.
31 31
  */
32
-function shutdownHandler () {
32
+function shutdownHandler() {
33 33
 	$error = error_get_last(); 
34 34
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
35
-        errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
35
+        errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
36 36
     }elseif ($error['type'] == 1) {
37 37
         dump($error);
38 38
     }
@@ -50,28 +50,28 @@  discard block
 block discarded – undo
50 50
 	$errstr = '';
51 51
 	switch ($jsonErrorNr) {
52 52
         case JSON_ERROR_NONE:
53
-            $errstr .= ' - No errors' . PHP_EOL;
53
+            $errstr .= ' - No errors'.PHP_EOL;
54 54
         break;
55 55
         case JSON_ERROR_DEPTH:
56
-            $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
56
+            $errstr .= ' - Maximum stack depth exceeded'.PHP_EOL;
57 57
         break;
58 58
         case JSON_ERROR_STATE_MISMATCH:
59
-            $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
59
+            $errstr .= ' - Underflow or the modes mismatch'.PHP_EOL;
60 60
         break;
61 61
         case JSON_ERROR_CTRL_CHAR:
62
-            $errstr .= ' - Unexpected control character found' . PHP_EOL;
62
+            $errstr .= ' - Unexpected control character found'.PHP_EOL;
63 63
         break;
64 64
         case JSON_ERROR_SYNTAX:
65
-            $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
65
+            $errstr .= ' - Syntax error, malformed JSON'.PHP_EOL;
66 66
         break;
67 67
         case JSON_ERROR_UTF8:
68
-            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
68
+            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded'.PHP_EOL;
69 69
         break;
70 70
         default:
71
-            $errstr = ' - Unknown error' . PHP_EOL;
71
+            $errstr = ' - Unknown error'.PHP_EOL;
72 72
         break;
73 73
     }
74
-	errorHandler ($jsonErrorNr, $errstr, $file, $line);
74
+	errorHandler($jsonErrorNr, $errstr, $file, $line);
75 75
 }
76 76
 
77 77
 /**
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
  * @param array  $trace
85 85
  * @param string $httpHeader
86 86
  */
87
-function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
87
+function renderError($message = '', $file = '', $line = '', $code = 0, $trace = array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
88 88
     if (ob_get_contents()) ob_end_clean();
89 89
 
90 90
     if (canShowError()) {
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
93 93
         $lines = array();
94 94
 
95 95
         foreach ($range as $line_number) {
96
-            if(isset($file_lines[$line_number-1])) {
97
-                $lines[$line_number] = $file_lines[$line_number-1];
96
+            if (isset($file_lines[$line_number - 1])) {
97
+                $lines[$line_number] = $file_lines[$line_number - 1];
98 98
             }
99 99
         }
100 100
 
@@ -112,22 +112,22 @@  discard block
 block discarded – undo
112 112
             renderCliException($message, $file, $line, $trace, $lines);
113 113
         }
114 114
 
115
-        if (file_exists(realpath(__DIR__) . '/errorviewdetailed.php')) {
116
-            header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
117
-            include(realpath(__DIR__) . '/errorviewdetailed.php');
115
+        if (file_exists(realpath(__DIR__).'/errorviewdetailed.php')) {
116
+            header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
117
+            include(realpath(__DIR__).'/errorviewdetailed.php');
118 118
         } else {
119
-            header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
119
+            header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
120 120
             header('Content-type: application/json');
121 121
             die(json_encode($error));
122 122
         }
123 123
         exit;
124 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');
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 131
         } else {
132 132
             header('Content-type: application/json');
133 133
             die(json_encode('An error occured.'));
@@ -154,6 +154,6 @@  discard block
 block discarded – undo
154 154
 function renderCliException($message, $file, $line, $trace, $lines)
155 155
 {
156 156
 	if (ob_get_contents()) ob_end_clean();
157
-	include(realpath(__DIR__) . '/errorviewcli.php');
157
+	include(realpath(__DIR__).'/errorviewcli.php');
158 158
     exit;
159 159
 }
160 160
\ No newline at end of file
Please login to merge, or discard this patch.