jetfirephp / routing

src/Routing/Dispatcher/TemplateDispatcher.php

Braces +6 added lines, -5 removed lines

@@ -47,11 +47,12 @@
      */
     public function call()
     {
-        if ($this->response->getStatusCode() == 202)
-            $this->setContentType($this->route->getTarget('extension'));
-        if (isset($this->route->getTarget('callback')[$this->route->getTarget('extension')]))
-            $this->response->setContent(call_user_func_array($this->route->getTarget('callback')[$this->route->getTarget('extension')], [$this->route]));
-        else {
+        if ($this->response->getStatusCode() == 202) {

+                    $this->setContentType($this->route->getTarget('extension'));

+        }

+        if (isset($this->route->getTarget('callback')[$this->route->getTarget('extension')])) {

+                    $this->response->setContent(call_user_func_array($this->route->getTarget('callback')[$this->route->getTarget('extension')], [$this->route]));

+        } else {
             ob_start();
             require($this->route->getTarget('template'));
             $this->response->setContent(ob_get_clean());

src/Routing/Matcher/ArrayMatcher.php

Braces +36 added lines, -21 removed lines

@@ -118,8 +118,9 @@ 
     {
         if (substr($this->request['route'], -1) == '*') {
             $pos = strpos($this->request['route'], '*');
-            if (substr($this->router->route->getUrl(), 0, $pos) == substr($this->request['route'], 0, $pos))
-                if (isset($this->request)) return true;
+            if (substr($this->router->route->getUrl(), 0, $pos) == substr($this->request['route'], 0, $pos)) {

+                            if (isset($this->request)) return true;

+            }

         }
         if (preg_match($regex, $this->router->route->getUrl(), $this->request['parameters'])) {
             array_shift($this->request['parameters']);
@@ -134,13 +135,16 @@ 
     private function generateTarget()
     {
         if($this->validMethod()) {
-            foreach($this->matcher as $match) if(call_user_func([$this,$match])) break;
+            foreach($this->matcher as $match) {

+                if(call_user_func([$this,$match])) break;

+            }

             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
             $this->router->route->addTarget('block',$this->router->collection->getRoutes('block_'.$index));
             $this->router->route->addTarget('view_dir',$this->router->collection->getRoutes('view_dir_'.$index));
             $this->router->response->setStatusCode(202);
-        }else
-            $this->router->response->setStatusCode(405);
+        } else {

+                    $this->router->response->setStatusCode(405);

+        }

         return $this->router->route->hasTarget();
     }
 
@@ -149,14 +153,18 @@ 
      */
     private function setRoute(){
         if (isset($this->request['params'])) {
-            if(is_callable($this->request['params']))
-                $this->router->route->setCallback($this->request['params']);
-            else {
+            if(is_callable($this->request['params'])) {

+                            $this->router->route->setCallback($this->request['params']);

+            } else {
                 (is_array($this->request['params']) && isset($this->request['params']['use']))
                     ? $this->router->route->setCallback($this->request['params']['use'])
                     : $this->router->route->setCallback($this->request['params']);
-                if (isset($this->request['params']['name'])) $this->router->route->setName($this->request['params']['name']);
-                if (isset($this->request['params']['method'])) $this->request['params']['method'] = is_array($this->request['params']['method']) ? $this->request['params']['method'] : [$this->request['params']['method']];
+                if (isset($this->request['params']['name'])) {

+                    $this->router->route->setName($this->request['params']['name']);

+                }

+                if (isset($this->request['params']['method'])) {

+                    $this->request['params']['method'] = is_array($this->request['params']['method']) ? $this->request['params']['method'] : [$this->request['params']['method']];

+                }

             }
         }
         $this->router->route->setDetail($this->request);
@@ -167,9 +175,12 @@ 
      */
     public function validMethod()
     {
-        if(is_callable($this->request['params']))return true;
-        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
-            return (isset($this->request['params']['ajax']) && $this->request['params']['ajax'] === true) ? true : false;
+        if(is_callable($this->request['params'])) {

+            return true;

+        }

+        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {

+                    return (isset($this->request['params']['ajax']) && $this->request['params']['ajax'] === true) ? true : false;

+        }

         $method = (isset($this->router->route->getDetail()['params']['method'])) ? $this->router->route->getDetail()['params']['method'] : ['GET'];
         return (in_array($this->router->route->getMethod(), $method)) ? true : false;
     }
@@ -198,13 +209,16 @@ 
     {
         if (strpos($this->router->route->getCallback(), '@') !== false) {
             $routes = explode('@', $this->router->route->getCallback());
-            if (!isset($routes[1])) $routes[1] = 'index';
+            if (!isset($routes[1])) {

+                $routes[1] = 'index';

+            }

             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
             $class = (class_exists($routes[0]))
                 ? $routes[0]
                 : $this->router->collection->getRoutes()['ctrl_namespace_'.$index].$routes[0];
-            if (!class_exists($class))
-                throw new \Exception('Class "' . $class . '." is not found');
+            if (!class_exists($class)) {

+                            throw new \Exception('Class "' . $class . '." is not found');

+            }

             if (method_exists($class, $routes[1])) {
                 $this->router->route->setTarget([
                     'dispatcher' => $this->dispatcher['matchController'],
@@ -231,9 +245,9 @@ 
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
             $viewDir = $this->router->collection->getRoutes('view_dir_' . $index);
             $target = null;
-            if (in_array('.' . $extension, $this->router->getConfig()['templateExtension']) && is_file($viewDir . $path))
-                $target = $viewDir . $path;
-            else {
+            if (in_array('.' . $extension, $this->router->getConfig()['templateExtension']) && is_file($viewDir . $path)) {

+                            $target = $viewDir . $path;

+            } else {
                 foreach ($this->router->getConfig()['templateExtension'] as $ext) {
                     if (is_file($viewDir . $path . $ext)) {
                         $target = $viewDir . $path . $ext;
@@ -242,8 +256,9 @@ 
                     }
                 }
             }
-            if(is_null($target))
-                throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
+            if(is_null($target)) {

+                            throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');

+            }

             $this->router->route->setTarget([
                 'dispatcher' => $this->dispatcher['matchTemplate'],
                 'template'   => $target,

src/Routing/Middleware.php

Braces +28 added lines, -16 removed lines

@@ -29,11 +29,14 @@ 
      */
     public function globalMiddleware()
     {
-        if (isset($this->router->collection->middleware['global_middleware']))
-            foreach ($this->router->collection->middleware['global_middleware'] as $mid) {
+        if (isset($this->router->collection->middleware['global_middleware'])) {

+                    foreach ($this->router->collection->middleware['global_middleware'] as $mid) {
                 if (class_exists($mid)) {
-                    $mid_global = call_user_func($this->router->getConfig()['di'],$mid);
-                    if (method_exists($mid_global, 'handle')) $this->callHandler($mid_global);
+                    $mid_global = call_user_func($this->router->getConfig()['di'],$mid);

+        }

+                    if (method_exists($mid_global, 'handle')) {

+                        $this->callHandler($mid_global);

+                    }

                 }
             }
     }
@@ -43,11 +46,14 @@ 
      */
     public function blockMiddleware()
     {
-        if (isset($this->router->collection->middleware['block_middleware']))
-            if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) {
-                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')];
+        if (isset($this->router->collection->middleware['block_middleware'])) {

+                    if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) {
+                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')];

+        }

                 $mid_block = call_user_func($this->router->getConfig()['di'],$class);
-                if (method_exists($mid_block, 'handle')) $this->callHandler($mid_block);
+                if (method_exists($mid_block, 'handle')) {

+                    $this->callHandler($mid_block);

+                }

             }
     }
 
@@ -61,7 +67,9 @@ 
             if (isset($this->router->collection->middleware['class_middleware'][$ctrl]) && class_exists($this->router->route->getTarget('controller'))) {
                 $class = $this->router->collection->middleware['class_middleware'][$ctrl];
                 $mid_class = call_user_func($this->router->getConfig()['di'],$class);
-                if (method_exists($mid_class, 'handle')) $this->callHandler($mid_class);
+                if (method_exists($mid_class, 'handle')) {

+                    $this->callHandler($mid_class);

+                }

             }
         }
     }
@@ -71,11 +79,14 @@ 
      */
     public function routeMiddleware()
     {
-        if (isset($this->router->collection->middleware['route_middleware']))
-            if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
-                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
+        if (isset($this->router->collection->middleware['route_middleware'])) {

+                    if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
+                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];

+        }

                 $mid_route = call_user_func($this->router->getConfig()['di'],$class);
-                if (method_exists($mid_route, 'handle')) $this->callHandler($mid_route);
+                if (method_exists($mid_route, 'handle')) {

+                    $this->callHandler($mid_route);

+                }

             }
     }
 
@@ -86,9 +97,10 @@ 
     private function callHandler($instance){
         $reflectionMethod = new ReflectionMethod($instance, 'handle');
         $dependencies = [];
-        foreach ($reflectionMethod->getParameters() as $arg)
-            if (!is_null($arg->getClass()))
-                $dependencies[] = $this->getClass($arg->getClass()->name);
+        foreach ($reflectionMethod->getParameters() as $arg) {

+                    if (!is_null($arg->getClass()))
+                $dependencies[] = $this->getClass($arg->getClass()->name);

+        }

         $dependencies = array_merge($dependencies,[$this->router->route]);
         return $reflectionMethod->invokeArgs($instance, $dependencies);
     }