@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | } else { |
| 79 | 79 | $uriPath = urldecode( |
| 80 | - parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH) |
|
| 80 | + parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) |
|
| 81 | 81 | ); |
| 82 | 82 | |
| 83 | 83 | $uriPathParts = explode('public/', $uriPath); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | // Module routing |
| 121 | 121 | if ($numOfUriSegments = count($uriSegments)) { |
| 122 | 122 | if (empty($app)) { |
| 123 | - if (false !== ($module = modules()->getModule( reset($uriSegments) ))) { |
|
| 123 | + if (false !== ($module = modules()->getModule(reset($uriSegments)))) { |
|
| 124 | 124 | //array_shift($uriSegments); |
| 125 | 125 | $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments)); |
| 126 | 126 | $uriString = $this->uri->getSegments()->getString(); |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | } |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - if($numOfUriSegments = count($uriSegments)) { |
|
| 132 | + if ($numOfUriSegments = count($uriSegments)) { |
|
| 133 | 133 | for ($i = 0; $i <= $numOfUriSegments; $i++) { |
| 134 | 134 | $uriRoutedSegments = array_diff($uriSegments, |
| 135 | 135 | array_slice($uriSegments, ($numOfUriSegments - $i))); |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | if (class_exists($controllerClassName = $controllerNamespace . implode('\\', |
| 221 | 221 | array_map('studlycase', $uriRoutedSegments)))) { |
| 222 | 222 | |
| 223 | - if($controllerClassName::$inherited) { |
|
| 223 | + if ($controllerClassName::$inherited) { |
|
| 224 | 224 | $uriSegments = array_diff($uriSegments, $uriRoutedSegments); |
| 225 | 225 | $this->setController(new KernelControllerDataStructure($controllerClassName), |
| 226 | 226 | $uriSegments); |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * Try to find requested page |
| 234 | 234 | */ |
| 235 | 235 | if (false !== ($pagesDir = $module->getResourcesDir('pages', true))) { |
| 236 | - if($controllerClassName = $this->getPagesControllerClassName()) { |
|
| 236 | + if ($controllerClassName = $this->getPagesControllerClassName()) { |
|
| 237 | 237 | |
| 238 | 238 | /** |
| 239 | 239 | * Try to find from database |
@@ -268,12 +268,12 @@ discard block |
||
| 268 | 268 | presenter()->page->setFile($pageFilePath); |
| 269 | 269 | } else { |
| 270 | 270 | $pageFilePath = str_replace('.phtml', DIRECTORY_SEPARATOR . 'index.phtml', $pageFilePath); |
| 271 | - if(is_file($pageFilePath)) { |
|
| 271 | + if (is_file($pageFilePath)) { |
|
| 272 | 272 | presenter()->page->setFile($pageFilePath); |
| 273 | 273 | } |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | - if(presenter()->page->file instanceof SplFileInfo) { |
|
| 276 | + if (presenter()->page->file instanceof SplFileInfo) { |
|
| 277 | 277 | $this->setController( |
| 278 | 278 | (new KernelControllerDataStructure($controllerClassName)) |
| 279 | 279 | ->setRequestMethod('index') |
@@ -316,19 +316,19 @@ discard block |
||
| 316 | 316 | { |
| 317 | 317 | $modules = modules()->getArrayCopy(); |
| 318 | 318 | |
| 319 | - foreach($modules as $module) { |
|
| 319 | + foreach ($modules as $module) { |
|
| 320 | 320 | $controllerClassName = $module->getNamespace() . 'Controllers\Pages'; |
| 321 | 321 | if ($module->getNamespace() === 'O2System\Framework\\') { |
| 322 | 322 | $controllerClassName = 'O2System\Framework\Http\Controllers\Pages'; |
| 323 | 323 | } |
| 324 | 324 | |
| 325 | - if(class_exists($controllerClassName)) { |
|
| 325 | + if (class_exists($controllerClassName)) { |
|
| 326 | 326 | return $controllerClassName; |
| 327 | 327 | break; |
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | 330 | |
| 331 | - if(class_exists('O2System\Framework\Http\Controllers\Pages')) { |
|
| 331 | + if (class_exists('O2System\Framework\Http\Controllers\Pages')) { |
|
| 332 | 332 | return 'O2System\Framework\Http\Controllers\Pages'; |
| 333 | 333 | } |
| 334 | 334 | |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | if (class_exists($controllerClassName)) { |
| 380 | 380 | $this->addresses->any( |
| 381 | 381 | '/', |
| 382 | - function () use ($controllerClassName) { |
|
| 382 | + function() use ($controllerClassName) { |
|
| 383 | 383 | return new $controllerClassName(); |
| 384 | 384 | } |
| 385 | 385 | ); |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | if (class_exists($controllerClassName)) { |
| 395 | 395 | $this->addresses->any( |
| 396 | 396 | '/', |
| 397 | - function () use ($controllerClassName) { |
|
| 397 | + function() use ($controllerClassName) { |
|
| 398 | 398 | return new $controllerClassName(); |
| 399 | 399 | } |
| 400 | 400 | ); |
@@ -446,8 +446,8 @@ discard block |
||
| 446 | 446 | ); |
| 447 | 447 | } elseif (preg_match("/([a-zA-Z0-9\\\]+)(@)([a-zA-Z0-9\\\]+)/", $closure, $matches)) { |
| 448 | 448 | $this->setController( |
| 449 | - (new KernelControllerDataStructure($matches[ 1 ])) |
|
| 450 | - ->setRequestMethod($matches[ 3 ]), |
|
| 449 | + (new KernelControllerDataStructure($matches[1])) |
|
| 450 | + ->setRequestMethod($matches[3]), |
|
| 451 | 451 | $uriSegments |
| 452 | 452 | ); |
| 453 | 453 | } elseif (presenter()->theme->use === true) { |