o2system / framework

src/Http/Router.php

Spacing +16 added lines, -16 removed lines

@@ -77,7 +77,7 @@ 
             }
         } else {
             $uriPath = urldecode(
-                parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH)
+                parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
             );
 
             $uriPathParts = explode('public/', $uriPath);
@@ -120,20 +120,20 @@ 
         // Module routing
         if ($numOfUriSegments = count($uriSegments)) {
             if (empty($app)) {
-                if (false !== ($module = modules()->getModule( reset($uriSegments) ))) {
+                if (false !== ($module = modules()->getModule(reset($uriSegments)))) {
                     //array_shift($uriSegments);
                     $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments));
                     $uriString = $this->uri->getSegments()->getString();
 
                     $this->registerModule($module);
                 }
-            } elseif (false !== ($module = modules()->getModule( [$app->getParameter(), 'modules', reset($uriSegments) ] ))) {
+            } elseif (false !== ($module = modules()->getModule([$app->getParameter(), 'modules', reset($uriSegments)]))) {
                 array_shift($uriSegments);
                 $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments));
                 $uriString = $this->uri->getSegments()->getString();
 
                 $this->registerModule($module);
-            } elseif (false !== ($module = modules()->getModule( [$app->getParameter(), 'plugins', reset($uriSegments) ] ))) {
+            } elseif (false !== ($module = modules()->getModule([$app->getParameter(), 'plugins', reset($uriSegments)]))) {
                 array_shift($uriSegments);
                 $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments));
                 $uriString = $this->uri->getSegments()->getString();
@@ -141,7 +141,7 @@ 
                 $this->registerModule($module);
             }
 
-            if($numOfUriSegments = count($uriSegments)) {
+            if ($numOfUriSegments = count($uriSegments)) {
                 for ($i = 0; $i <= $numOfUriSegments; $i++) {
                     $uriRoutedSegments = array_diff($uriSegments,
                         array_slice($uriSegments, ($numOfUriSegments - $i)));
@@ -232,7 +232,7 @@ 
                     if (class_exists($controllerClassName = $controllerNamespace . implode('\\',
                             array_map('studlycase', $uriRoutedSegments)))) {
 
-                        if($controllerClassName::$inherited) {
+                        if ($controllerClassName::$inherited) {
                             $uriSegments = array_diff($uriSegments, $uriRoutedSegments);
                             $this->setController(new KernelControllerDataStructure($controllerClassName),
                                 $uriSegments);
@@ -249,7 +249,7 @@ 
                      * Try to find requested page
                      */
                     if (false !== ($pagesDir = $module->getResourcesDir('pages', true))) {
-                        if($controllerClassName = $this->getPagesControllerClassName()) {
+                        if ($controllerClassName = $this->getPagesControllerClassName()) {
 
                             /**
                              * Try to find from database
@@ -284,12 +284,12 @@ 
                                 presenter()->page->setFile($pageFilePath);
                             } else {
                                 $pageFilePath = str_replace('.phtml', DIRECTORY_SEPARATOR . 'index.phtml', $pageFilePath);
-                                if(is_file($pageFilePath)) {
+                                if (is_file($pageFilePath)) {
                                     presenter()->page->setFile($pageFilePath);
                                 }
                             }
 
-                            if(presenter()->page->file instanceof SplFileInfo) {
+                            if (presenter()->page->file instanceof SplFileInfo) {
                                 $this->setController(
                                     (new KernelControllerDataStructure($controllerClassName))
                                         ->setRequestMethod('index')
@@ -332,19 +332,19 @@ 
     {
         $modules = modules()->getArrayCopy();
 
-        foreach($modules as $module) {
+        foreach ($modules as $module) {
             $controllerClassName = $module->getNamespace() . 'Controllers\Pages';
             if ($module->getNamespace() === 'O2System\Framework\\') {
                 $controllerClassName = 'O2System\Framework\Http\Controllers\Pages';
             }
 
-            if(class_exists($controllerClassName)) {
+            if (class_exists($controllerClassName)) {
                 return $controllerClassName;
                 break;
             }
         }
 
-        if(class_exists('O2System\Framework\Http\Controllers\Pages')) {
+        if (class_exists('O2System\Framework\Http\Controllers\Pages')) {
             return 'O2System\Framework\Http\Controllers\Pages';
         }
 
@@ -395,7 +395,7 @@ 
                 if (class_exists($controllerClassName)) {
                     $this->addresses->any(
                         '/',
-                        function () use ($controllerClassName) {
+                        function() use ($controllerClassName) {
                             return new $controllerClassName();
                         }
                     );
@@ -410,7 +410,7 @@ 
             if (class_exists($controllerClassName)) {
                 $this->addresses->any(
                     '/',
-                    function () use ($controllerClassName) {
+                    function() use ($controllerClassName) {
                         return new $controllerClassName();
                     }
                 );
@@ -462,8 +462,8 @@ 
                 );
             } elseif (preg_match("/([a-zA-Z0-9\\\]+)(@)([a-zA-Z0-9\\\]+)/", $closure, $matches)) {
                 $this->setController(
-                    (new KernelControllerDataStructure($matches[ 1 ]))
-                        ->setRequestMethod($matches[ 3 ]),
+                    (new KernelControllerDataStructure($matches[1]))
+                        ->setRequestMethod($matches[3]),
                     $uriSegments
                 );
             } elseif (presenter()->theme->use === true) {