@@ -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 |
@@ -32,11 +32,11 @@ |
||
32 | 32 | */ |
33 | 33 | function shutdownHandler () { |
34 | 34 | $error = error_get_last(); |
35 | - if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
|
35 | + if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
|
36 | 36 | \library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']); |
37 | - }elseif ($error['type'] == 1) { |
|
38 | - dump($error); |
|
39 | - } |
|
37 | + }elseif ($error['type'] == 1) { |
|
38 | + dump($error); |
|
39 | + } |
|
40 | 40 | } |
41 | 41 | |
42 | 42 |
@@ -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 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | $error = error_get_last(); |
35 | 35 | if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { |
36 | 36 | \library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']); |
37 | - }elseif ($error['type'] == 1) { |
|
37 | + } elseif ($error['type'] == 1) { |
|
38 | 38 | dump($error); |
39 | 39 | } |
40 | 40 | } |
@@ -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) { |