@@ -79,13 +79,13 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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); |
@@ -73,7 +73,7 @@ discard block |
||
| 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 |
||
| 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 |
@@ -105,13 +105,13 @@ discard block |
||
| 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 |
||
| 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 |
||
| 155 | 155 | protected function saveSubset($subset) |
| 156 | 156 | { |
| 157 | 157 | $json = json_encode($this->$subset, JSON_PRETTY_PRINT); |
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | global $rootPath; |
| 29 | - $file = $rootPath . str_replace('\\', '/', $class) . ".php"; |
|
| 29 | + $file = $rootPath.str_replace('\\', '/', $class).".php"; |
|
| 30 | 30 | |
| 31 | 31 | if (file_exists($file)) { |
| 32 | 32 | return self::loadClassInExistingFile($class, $throwException, $file); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | require_once($file); |
| 61 | 61 | if ($throwException) { |
| 62 | 62 | if (class_exists($class, false) === false && interface_exists($class, false) === false) { |
| 63 | - throw new \Exception('Could not load class "' . $class . '" in file ' . $file); |
|
| 63 | + throw new \Exception('Could not load class "'.$class.'" in file '.$file); |
|
| 64 | 64 | } else { |
| 65 | 65 | return true; |
| 66 | 66 | } |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | private static function handleUnloadableClassWithBacktrace($class, $throwException, $rootPath, $file, $debug_backtrace) |
| 82 | 82 | { |
| 83 | 83 | if ($throwException) { |
| 84 | - errorHandler(0, 'Could not load class \'' . $class . '\' in file ' . $rootPath . $file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']); |
|
| 84 | + errorHandler(0, 'Could not load class \''.$class.'\' in file '.$rootPath.$file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']); |
|
| 85 | 85 | } else { |
| 86 | 86 | return false; |
| 87 | 87 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | private static function handleUnloadableClassWithoutBacktrace($class, $throwException, $file) |
| 99 | 99 | { |
| 100 | 100 | if ($throwException) { |
| 101 | - throw new \Exception('Could not load class "' . $class . '" in file ' . $file . "\n" . 'Called from unknown origin.'); |
|
| 101 | + throw new \Exception('Could not load class "'.$class.'" in file '.$file."\n".'Called from unknown origin.'); |
|
| 102 | 102 | } else { |
| 103 | 103 | return false; |
| 104 | 104 | } |
@@ -2,21 +2,21 @@ discard block |
||
| 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 |
||
| 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 |
@@ -1,9 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | -require_once(__DIR__ . DIRECTORY_SEPARATOR . 'AutoloadUtil.php'); |
|
| 2 | +require_once(__DIR__.DIRECTORY_SEPARATOR.'AutoloadUtil.php'); |
|
| 3 | 3 | spl_autoload_extensions('.php'); |
| 4 | 4 | spl_autoload_register("autoloader"); |
| 5 | 5 | |
| 6 | -$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/'); |
|
| 6 | +$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/'); |
|
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | 9 | * The function to be registered as the default autoload function |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once(__DIR__ . DIRECTORY_SEPARATOR . 'ErrorHandlingUtil.php'); |
|
| 2 | +require_once(__DIR__.DIRECTORY_SEPARATOR.'ErrorHandlingUtil.php'); |
|
| 3 | 3 | set_exception_handler('exceptionHandler'); |
| 4 | 4 | set_error_handler('errorHandler'); |
| 5 | 5 | register_shutdown_function('shutdownHandler'); |
@@ -10,8 +10,8 @@ discard block |
||
| 10 | 10 | * |
| 11 | 11 | * @param $e |
| 12 | 12 | */ |
| 13 | -function exceptionHandler ($e) { |
|
| 14 | - \library\cc\ErrorHandlingUtil::renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace()); |
|
| 13 | +function exceptionHandler($e) { |
|
| 14 | + \library\cc\ErrorHandlingUtil::renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace()); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | /** |
@@ -22,18 +22,18 @@ discard block |
||
| 22 | 22 | * @param $errfile |
| 23 | 23 | * @param $errline |
| 24 | 24 | */ |
| 25 | -function errorHandler ($errno, $errstr, $errfile, $errline) { |
|
| 26 | - \library\cc\ErrorHandlingUtil::renderError($errstr,$errfile,$errline,$errno,debug_backtrace()); |
|
| 25 | +function errorHandler($errno, $errstr, $errfile, $errline) { |
|
| 26 | + \library\cc\ErrorHandlingUtil::renderError($errstr, $errfile, $errline, $errno, debug_backtrace()); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * When an error occurs that kills the process, still try |
| 31 | 31 | * to show it using a shutdownHandler. |
| 32 | 32 | */ |
| 33 | -function shutdownHandler () { |
|
| 33 | +function shutdownHandler() { |
|
| 34 | 34 | $error = error_get_last(); |
| 35 | 35 | if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
| 36 | - \library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']); |
|
| 36 | + \library\cc\ErrorHandlingUtil::renderError($error['message'], $error['file'], $error['line'], $error['type']); |
|
| 37 | 37 | }elseif ($error['type'] == 1) { |
| 38 | 38 | dump($error); |
| 39 | 39 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * @param array $parameters |
| 42 | 42 | * @param $matchedSitemapItem |
| 43 | 43 | */ |
| 44 | - public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem) |
|
| 44 | + public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem) |
|
| 45 | 45 | { |
| 46 | 46 | $this->template = $template; |
| 47 | 47 | $this->request = $request; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * |
| 67 | 67 | * @throws \Exception |
| 68 | 68 | */ |
| 69 | - public function render($application=null) |
|
| 69 | + public function render($application = null) |
|
| 70 | 70 | { |
| 71 | 71 | $this->renderedContent = $this->renderTemplate($this->template, true, $application); |
| 72 | 72 | } |
@@ -92,9 +92,9 @@ discard block |
||
| 92 | 92 | * @return string |
| 93 | 93 | * @throws \Exception |
| 94 | 94 | */ |
| 95 | - public function renderTemplate($template='', $obClean = true, $application=null) |
|
| 95 | + public function renderTemplate($template = '', $obClean = true, $application = null) |
|
| 96 | 96 | { |
| 97 | - $templatePath = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php'; |
|
| 97 | + $templatePath = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.$template.'.php'; |
|
| 98 | 98 | if (realpath($templatePath) !== false) { |
| 99 | 99 | if ($obClean) { |
| 100 | 100 | ob_clean(); |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | return ob_get_contents(); |
| 112 | 112 | } else { |
| 113 | 113 | if ($template !== null) { // If template is null, its a application component, which doesnt have a template |
| 114 | - throw new \Exception('Couldnt find template ' . $templatePath); |
|
| 114 | + throw new \Exception('Couldnt find template '.$templatePath); |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * @return string |
| 127 | 127 | * @throws \Exception |
| 128 | 128 | */ |
| 129 | - public function includeTemplate($template='', $parameters = array()) |
|
| 129 | + public function includeTemplate($template = '', $parameters = array()) |
|
| 130 | 130 | { |
| 131 | 131 | if (is_array($parameters)) { |
| 132 | 132 | foreach ($parameters as $name => $value) { |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | private static function renderCliException($message, $file, $line, $trace, $lines) |
| 76 | 76 | { |
| 77 | 77 | if (ob_get_contents()) ob_end_clean(); |
| 78 | - include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcli.php'); |
|
| 78 | + include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcli.php'); |
|
| 79 | 79 | exit; |
| 80 | 80 | } |
| 81 | 81 | |
@@ -87,12 +87,12 @@ discard block |
||
| 87 | 87 | */ |
| 88 | 88 | private static function dontShowError($message, $file, $line, $httpHeader) |
| 89 | 89 | { |
| 90 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 91 | - header('X-Error-Message: ' . $message); |
|
| 92 | - header('X-Error-File: ' . $file); |
|
| 93 | - header('X-Error-Line: ' . $line); |
|
| 94 | - if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php')) { |
|
| 95 | - include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php'); |
|
| 90 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
| 91 | + header('X-Error-Message: '.$message); |
|
| 92 | + header('X-Error-File: '.$file); |
|
| 93 | + header('X-Error-Line: '.$line); |
|
| 94 | + if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php')) { |
|
| 95 | + include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php'); |
|
| 96 | 96 | } else { |
| 97 | 97 | header('Content-type: application/json'); |
| 98 | 98 | die(json_encode('An error occured.')); |
@@ -160,11 +160,11 @@ discard block |
||
| 160 | 160 | 'httpHeader' => $httpHeader, |
| 161 | 161 | ); |
| 162 | 162 | |
| 163 | - if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php')) { |
|
| 164 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 165 | - include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php'); |
|
| 163 | + if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php')) { |
|
| 164 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
| 165 | + include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php'); |
|
| 166 | 166 | } else { |
| 167 | - header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true); |
|
| 167 | + header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true); |
|
| 168 | 168 | header('Content-type: application/json'); |
| 169 | 169 | die(json_encode($error)); |
| 170 | 170 | } |