jetfirephp / routing

src/Routing/Dispatcher/MvcDispatcher.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 

 namespace JetFire\Routing\Dispatcher;

 

-use JetFire\Routing\Router;

-use ReflectionClass;

+use JetFire\Routing\Router;
+use ReflectionClass;
 use ReflectionMethod;

 

 /**

Braces +6 added lines, -4 removed lines

@@ -40,8 +40,9 @@ 
                 array_unshift($dependencies, new $class);

             }

         }

-        if ($this->router->route->getResponse('code') == 202)

-            $this->router->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);

+        if ($this->router->route->getResponse('code') == 202) {

+                    $this->router->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);

+        }

         return $reflectionMethod->invokeArgs($this->getController(), $dependencies);

     }

 

@@ -53,8 +54,9 @@ 
     private function getController()

     {

         $reflector = new ReflectionClass($this->router->route->getTarget('controller'));

-        if (!$reflector->isInstantiable())

-            throw new \Exception('Target [' . $this->router->route->getTarget('controller') . '] is not instantiable.');

+        if (!$reflector->isInstantiable()) {

+                    throw new \Exception('Target [' . $this->router->route->getTarget('controller') . '] is not instantiable.');

+        }

         $constructor = $reflector->getConstructor();

         if (is_null($constructor)) {

             $class = $this->router->route->getTarget('controller');

src/Routing/Match/RoutesMatch.php

Doc Comments +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     }

 

     /**

-     * @param $regex

+     * @param string $regex

      * @return bool

      */

     private function routeMatch($regex)

Spacing +10 added lines, -10 removed lines

@@ -86,7 +86,7 @@ 
      */

     private function generateTarget()

     {

-        if(is_callable($this->request['path'])){

+        if (is_callable($this->request['path'])) {

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

             $this->router->route->setDetail($this->request);

             $this->anonymous();

@@ -99,10 +99,10 @@ 
                     ? $this->router->route->setCallback($this->request['path']['use'])

                     : $this->router->route->setCallback($this->request['path']);

             $this->router->route->setDetail($this->request);

-            if($this->validMethod()) {

-                $this->anonymous();$this->mvc();$this->template();

+            if ($this->validMethod()) {

+                $this->anonymous(); $this->mvc(); $this->template();

                 $this->router->route->setResponse(['code' => 202, 'message' => 'Accepted']);

-            }else

+            } else

                 $this->router->route->setResponse(['code' => 405, 'message' => 'Method Not Allowed']);

         }

         return $this->router->route->hasTarget();

@@ -144,7 +144,7 @@ 
             $index = isset($this->request['index']) ? $this->request['index'] : 0;

             $class = (class_exists($routes[0]))

                 ? $routes[0]

-                : $this->router->collection->getRoutes()['namespace_'.$index].$routes[0];

+                : $this->router->collection->getRoutes()['namespace_' . $index] . $routes[0];

             if (!class_exists($class))

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

             if (method_exists($class, $routes[1])) {

@@ -167,23 +167,23 @@ 
             $extension = explode('.', $path);

             $extension = end($extension);

             $index = isset($this->request['index']) ? $this->request['index'] : 0;

-            $block = $this->router->collection->getRoutes('path_'.$index);

+            $block = $this->router->collection->getRoutes('path_' . $index);

             if (in_array('.' . $extension, $this->router->getConfig()['viewExtension'])) {

                 if (is_file($block . $path)) {

                     $target = $block . $path;

-                    $this->router->route->setTarget(['dispatcher' => 'JetFire\Routing\Dispatcher\TemplateDispatcher', 'template' => $target,'block' => $block, 'extension' => $extension]);

+                    $this->router->route->setTarget(['dispatcher' => 'JetFire\Routing\Dispatcher\TemplateDispatcher', 'template' => $target, 'block' => $block, 'extension' => $extension]);

                     return true;

                 }

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

             } else {

                 foreach ($this->router->getConfig()['viewExtension'] as $ext) {

-                    if (is_file($block . $path . $ext)){

+                    if (is_file($block . $path . $ext)) {

                         $target = $block . $path . $ext;

-                        $this->router->route->setTarget(['dispatcher' => 'JetFire\Routing\Dispatcher\TemplateDispatcher', 'template' => $target,'block' => $block,  'extension' => str_replace('.', '', $ext)]);

+                        $this->router->route->setTarget(['dispatcher' => 'JetFire\Routing\Dispatcher\TemplateDispatcher', 'template' => $target, 'block' => $block, 'extension' => str_replace('.', '', $ext)]);

                         return true;

                     }

                 }

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

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

             }

         }

         return false;

Braces +27 added lines, -15 removed lines

@@ -42,8 +42,9 @@ 
                 $this->request['path'] = $dependencies;

                 $this->request['index'] = $i;

                 $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/' . trim(trim($this->request['prefix'], '/') . '/' . trim($route, '/'), '/'));

-                if ($this->routeMatch('#^' . $this->request['route'] . '$#'))

-                    return $this->generateTarget();

+                if ($this->routeMatch('#^' . $this->request['route'] . '$#')) {

+                                    return $this->generateTarget();

+                }

             }

         }

         unset($this->request);

@@ -71,8 +72,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']);

@@ -92,18 +94,24 @@ 
             $this->anonymous();

             $this->router->route->setResponse(['code' => 202, 'message' => 'Accepted']);

         } else {

-            if (isset($this->request['path']['name'])) $this->router->route->setName($this->request['path']['name']);

-            if (isset($this->request['path']['method'])) $this->request['path']['method'] = is_array($this->request['path']['method']) ? $this->request['path']['method'] : [$this->request['path']['method']];

-            if (isset($this->request['path']))

-                (is_array($this->request['path']) && isset($this->request['path']['use']))

+            if (isset($this->request['path']['name'])) {

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

+            }

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

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

+            }

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

+                            (is_array($this->request['path']) && isset($this->request['path']['use']))

                     ? $this->router->route->setCallback($this->request['path']['use'])

                     : $this->router->route->setCallback($this->request['path']);

+            }

             $this->router->route->setDetail($this->request);

             if($this->validMethod()) {

                 $this->anonymous();$this->mvc();$this->template();

                 $this->router->route->setResponse(['code' => 202, 'message' => 'Accepted']);

-            }else

-                $this->router->route->setResponse(['code' => 405, 'message' => 'Method Not Allowed']);

+            } else {

+                            $this->router->route->setResponse(['code' => 405, 'message' => 'Method Not Allowed']);

+            }

         }

         return $this->router->route->hasTarget();

     }

@@ -113,8 +121,9 @@ 
      */

     public function validMethod()

     {

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

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

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

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

+        }

         $method = (isset($this->router->route->getDetail()['path']['method'])) ? $this->router->route->getDetail()['path']['method'] : ['GET'];

         return (in_array($this->router->route->getMethod(), $method)) ? true : false;

     }

@@ -140,13 +149,16 @@ 
     {

         if (!$this->router->route->hasTarget() && 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['index']) ? $this->request['index'] : 0;

             $class = (class_exists($routes[0]))

                 ? $routes[0]

                 : $this->router->collection->getRoutes()['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' => 'JetFire\Routing\Dispatcher\MvcDispatcher', 'controller' => $class, 'action' => $routes[1]]);

                 return true;

src/Routing/Route.php

Doc Comments +5 added lines, -5 removed lines

@@ -76,7 +76,7 @@ 
     }

 

     /**

-     * @param $url

+     * @param string $url

      */

     public function setUrl($url)

     {

@@ -116,7 +116,7 @@ 
     }

 

     /**

-     * @param null $key

+     * @param string $key

      * @return int

      */

     public function getResponse($key = null)

@@ -139,7 +139,7 @@ 
     }

 

     /**

-     * @return array

+     * @return string

      */

     public function getMethod()

     {

@@ -163,7 +163,7 @@ 
     }

 

     /**

-     * @param $key

+     * @param string $key

      * @param $value

      */

     public function addDetail($key, $value)

@@ -172,7 +172,7 @@ 
     }

 

     /**

-     * @param null $key

+     * @param string $key

      * @return array|null

      */

     public function getTarget($key = null)

Spacing +2 added lines, -2 removed lines

@@ -205,8 +205,8 @@
     /**

      * @return array

      */

-    public function getData(){

-        return (isset($this->getDetail()['data']) && is_array($this->getDetail()['data']))?$this->getDetail()['data']:[];

+    public function getData() {

+        return (isset($this->getDetail()['data']) && is_array($this->getDetail()['data'])) ? $this->getDetail()['data'] : [];

     }

 

     /**

Braces +29 added lines, -15 removed lines

@@ -60,11 +60,21 @@ 
      */

     public function set($args = [])

     {

-        if (isset($args['name'])) $this->name = $args['name'];

-        if (isset($args['callback'])) $this->callback = $args['callback'];

-        if (isset($args['code'])) $this->response['code'] = $args['code'];

-        if (isset($args['target'])) $this->target = $args['target'];

-        if (isset($args['detail'])) $this->detail = $args['detail'];

+        if (isset($args['name'])) {

+            $this->name = $args['name'];

+        }

+        if (isset($args['callback'])) {

+            $this->callback = $args['callback'];

+        }

+        if (isset($args['code'])) {

+            $this->response['code'] = $args['code'];

+        }

+        if (isset($args['target'])) {

+            $this->target = $args['target'];

+        }

+        if (isset($args['detail'])) {

+            $this->detail = $args['detail'];

+        }

     }

 

     /**

@@ -121,8 +131,9 @@ 
      */

     public function getResponse($key = null)

     {

-        if (!is_null($key) && isset($this->response[$key]))

-            return $this->response[$key];

+        if (!is_null($key) && isset($this->response[$key])) {

+                    return $this->response[$key];

+        }

         return $this->response;

     }

 

@@ -132,10 +143,11 @@ 
      */

     public function setResponse($key = null, $value = null)

     {

-        if (!is_null($key) && !is_null($value))

-            $this->response[$key] = $value;

-        else

-            $this->response = array_merge($this->response, $key);

+        if (!is_null($key) && !is_null($value)) {

+                    $this->response[$key] = $value;

+        } else {

+                    $this->response = array_merge($this->response, $key);

+        }

     }

 

     /**

@@ -177,8 +189,9 @@ 
      */

     public function getTarget($key = null)

     {

-        if (!is_null($key))

-            return isset($this->target[$key]) ? $this->target[$key] : '';

+        if (!is_null($key)) {

+                    return isset($this->target[$key]) ? $this->target[$key] : '';

+        }

         return empty($this->target) ? '' : $this->target;

     }

 

@@ -197,8 +210,9 @@ 
      */

     public function hasTarget($key = null)

     {

-        if (!is_null($key))

-            return isset($this->target[$key]) ? true : false;

+        if (!is_null($key)) {

+                    return isset($this->target[$key]) ? true : false;

+        }

         return empty($this->target) ? false : true;

     }

 

src/Routing/Dispatcher/FunctionDispatcher.php

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
      */

     public function call()

     {

-        if ($this->router->route->getResponse('code') == 202) $this->router->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);

+        if ($this->router->route->getResponse('code') == 202) {

+            $this->router->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);

+        }

         $params = ($this->router->route->getParameters() == '') ? [] : $this->router->route->getParameters();

         echo call_user_func_array($this->router->route->getTarget('closure'), $params);

     }

src/Routing/Dispatcher/TemplateDispatcher.php

Braces +8 added lines, -6 removed lines

@@ -30,10 +30,11 @@ 
      */

     public function call()

     {

-        if ($this->router->route->getResponse('code') == 202)

-            switch ($this->router->route->getTarget('extension')) {

+        if ($this->router->route->getResponse('code') == 202) {

+                    switch ($this->router->route->getTarget('extension')) {

                 case 'json':

                     $this->router->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'application/json']);

+        }

                     header('Content-Type: application/json');

                     break;

                 case 'xml':

@@ -44,10 +45,11 @@ 
                     $this->router->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);

                     break;

             }

-        if (isset($this->router->getConfig()['viewCallback'][$this->router->route->getTarget('extension')]))

-            call_user_func_array($this->router->getConfig()['viewCallback'][$this->router->route->getTarget('extension')], [$this->router->route]);

-        else

-            require($this->router->route->getTarget('template'));

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

+                    call_user_func_array($this->router->getConfig()['viewCallback'][$this->router->route->getTarget('extension')], [$this->router->route]);

+        } else {

+                    require($this->router->route->getTarget('template'));

+        }

     }

 

 } 
\ No newline at end of file

src/Routing/Match/SmartMatch.php

Spacing +7 added lines, -7 removed lines

@@ -43,9 +43,9 @@ 
     {

         foreach ($this->router->getConfig()['viewExtension'] as $extension) {

             for ($i = 0; $i < $this->router->collection->countRoutes; ++$i) {

-                $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_' . $i), '',$this->router->route->getUrl()));

+                $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_' . $i), '', $this->router->route->getUrl()));

                 $end = array_pop($url);

-                $url = implode('/', array_map('ucwords', $url)).'/'.$end;

+                $url = implode('/', array_map('ucwords', $url)) . '/' . $end;

                 if (is_file(($template = rtrim($this->router->collection->getRoutes('path_' . $i), '/') . $url . $extension))) {

                     $this->router->route->setTarget(['dispatcher' => 'JetFire\Routing\Dispatcher\TemplateDispatcher', 'template' => $template, 'extension' => str_replace('.', '', $extension)]);

                     $this->router->route->addDetail('block', $this->router->collection->getRoutes('path_' . $i));

@@ -63,12 +63,12 @@ 
     {

         $routes = array_slice(explode('/', $this->router->route->getUrl()), 1);

         $i = 0;

-        do{

-            $route =  ('/' . $routes[0] == $this->router->collection->getRoutes('prefix_' . $i))

+        do {

+            $route = ('/' . $routes[0] == $this->router->collection->getRoutes('prefix_' . $i))

                 ? array_slice($routes, 1) : $routes;

             if (isset($route[0])) {

-                $class =  (class_exists($this->router->collection->getRoutes('namespace_' . $i). ucfirst($route[0]) . 'Controller'))

-                    ? $this->router->collection->getRoutes('namespace_' . $i). ucfirst($route[0]) . 'Controller'

+                $class = (class_exists($this->router->collection->getRoutes('namespace_' . $i) . ucfirst($route[0]) . 'Controller'))

+                    ? $this->router->collection->getRoutes('namespace_' . $i) . ucfirst($route[0]) . 'Controller'

                     : ucfirst($route[0]) . 'Controller';

                 if (isset($route[1]) && method_exists($class, $route[1])) {

                     $this->router->route->setTarget(['dispatcher' => 'JetFire\Routing\Dispatcher\MvcDispatcher', 'controller' => $class, 'action' => $route[1]]);

@@ -77,7 +77,7 @@ 
                 }

             }

             ++$i;

-        }while($i < $this->router->collection->countRoutes);

+        }while ($i < $this->router->collection->countRoutes);

         return false;

     }

 

src/Routing/Middleware.php

Braces +21 added lines, -10 removed lines

@@ -28,11 +28,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 = new $mid;

-                    if (method_exists($mid_global, 'handle')) $mid_global->handle($this->router->route);

+        }

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

+                        $mid_global->handle($this->router->route);

+                    }

                 }

             }

     }

@@ -42,11 +45,14 @@ 
      */

     public function blockMiddleware()

     {

-        if (isset($this->router->collection->middleware['block_middleware']))

-            if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()])) {

+        if (isset($this->router->collection->middleware['block_middleware'])) {

+                    if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()])) {

                 $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()];

+        }

                 $mid_block = new $class;

-                if (method_exists($mid_block, 'handle')) $mid_block->handle($this->router->route);

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

+                    $mid_block->handle($this->router->route);

+                }

             }

     }

 

@@ -60,7 +66,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 = new $class;

-                if (method_exists($mid_class, 'handle')) $mid_class->handle($this->router->route);

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

+                    $mid_class->handle($this->router->route);

+                }

             }

         }

     }

@@ -70,11 +78,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']])) {

+        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 = new $class;

-                if (method_exists($mid_route, 'handle')) $mid_route->handle($this->router->route);

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

+                    $mid_route->handle($this->router->route);

+                }

             }

     }

 

src/Routing/RouteCollection.php

Spacing +9 added lines, -9 removed lines

@@ -42,11 +42,11 @@ 
      */

     public function addRoutes($routes = null, $options = [])

     {

-        if(!is_null($routes) && !is_array($routes)) {

+        if (!is_null($routes) && !is_array($routes)) {

             if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';

             if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;

             elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;

-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');

+            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "' . $routes . '" given');

         }

         $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];

         $this->routes['path_' . $this->countRoutes] = (isset($options['path']) && !empty($options['path'])) ? rtrim($options['path'], '/') . '/' : '';

@@ -61,8 +61,8 @@ 
      */

     public function getRoutes($key = null)

     {

-        if(!is_null($key))

-            return isset($this->routes[$key])?$this->routes[$key]:'';

+        if (!is_null($key))

+            return isset($this->routes[$key]) ? $this->routes[$key] : '';

         return $this->routes;

     }

 

@@ -78,7 +78,7 @@ 
         } elseif (is_string($args))

             for ($i = 0; $i < $this->countRoutes; ++$i)

                 $this->routes['prefix_' . $i] = '/' . trim($args, '/');

-        if($this->countRoutes == 0)$this->countRoutes++;

+        if ($this->countRoutes == 0)$this->countRoutes++;

     }

 

     /**

@@ -88,14 +88,14 @@ 
     {

         $nbrArgs = count($args);

         for ($i = 0; $i < $nbrArgs; ++$i) {

-            if(is_array($args[$i])){

+            if (is_array($args[$i])) {

                 $this->routes['path_' . $i] = (isset($args[$i]['path']) && !empty($args[$i]['path'])) ? rtrim($args[$i]['path'], '/') . '/' : '';

                 $this->routes['namespace_' . $i] = (isset($args[$i]['namespace']) && !empty($args[$i]['namespace'])) ? trim($args[$i]['namespace'], '\\') . '\\' : '';

-                $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/'.trim($args[$i]['prefix'], '/') : '';

-                if(!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];

+                $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/' . trim($args[$i]['prefix'], '/') : '';

+                if (!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];

             }

         }

-        if($this->countRoutes == 0)$this->countRoutes++;

+        if ($this->countRoutes == 0)$this->countRoutes++;

     }

 

     /**

Braces +57 added lines, -28 removed lines

@@ -33,7 +33,9 @@ 
      */

     public function __construct($routes = null, $options = [])

     {

-        if (!is_null($routes) || !empty($options)) $this->addRoutes($routes, $options);

+        if (!is_null($routes) || !empty($options)) {

+            $this->addRoutes($routes, $options);

+        }

     }

 

     /**

@@ -43,10 +45,16 @@ 
     public function addRoutes($routes = null, $options = [])

     {

         if(!is_null($routes) && !is_array($routes)) {

-            if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';

-            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;

-            elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;

-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');

+            if (strpos($routes, '.php') === false) {

+                $routes = trim($routes, '/') . '/';

+            }

+            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) {

+                $routes = $routesFile;

+            } elseif (is_file($routes) && is_array($routesFile = include $routes)) {

+                $routes = $routesFile;

+            } else {

+                throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');

+            }

         }

         $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];

         $this->routes['path_' . $this->countRoutes] = (isset($options['path']) && !empty($options['path'])) ? rtrim($options['path'], '/') . '/' : '';

@@ -61,8 +69,9 @@ 
      */

     public function getRoutes($key = null)

     {

-        if(!is_null($key))

-            return isset($this->routes[$key])?$this->routes[$key]:'';

+        if(!is_null($key)) {

+                    return isset($this->routes[$key])?$this->routes[$key]:'';

+        }

         return $this->routes;

     }

 

@@ -73,12 +82,18 @@ 
     {

         if (is_array($args)) {

             $nbrArgs = count($args);

-            for ($i = 0; $i < $nbrArgs; ++$i)

-                $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');

-        } elseif (is_string($args))

-            for ($i = 0; $i < $this->countRoutes; ++$i)

-                $this->routes['prefix_' . $i] = '/' . trim($args, '/');

-        if($this->countRoutes == 0)$this->countRoutes++;

+            for ($i = 0; $i < $nbrArgs; ++$i) {

+                            $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');

+            }

+        } elseif (is_string($args)) {

+                    for ($i = 0;

+        }

+        $i < $this->countRoutes; ++$i) {

+                            $this->routes['prefix_' . $i] = '/' . trim($args, '/');

+            }

+        if($this->countRoutes == 0) {

+            $this->countRoutes++;

+        }

     }

 

     /**

@@ -92,10 +107,14 @@ 
                 $this->routes['path_' . $i] = (isset($args[$i]['path']) && !empty($args[$i]['path'])) ? rtrim($args[$i]['path'], '/') . '/' : '';

                 $this->routes['namespace_' . $i] = (isset($args[$i]['namespace']) && !empty($args[$i]['namespace'])) ? trim($args[$i]['namespace'], '\\') . '\\' : '';

                 $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/'.trim($args[$i]['prefix'], '/') : '';

-                if(!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];

+                if(!isset($this->routes['routes_' . $i])) {

+                    $this->routes['routes_' . $i] = [];

+                }

             }

         }

-        if($this->countRoutes == 0)$this->countRoutes++;

+        if($this->countRoutes == 0) {

+            $this->countRoutes++;

+        }

     }

 

     /**

@@ -104,12 +123,16 @@ 
      */

     public function setMiddleware($middleware)

     {

-        if (is_string($middleware)) $middleware = rtrim($middleware, '/');

-        if (is_file($middleware) && is_array($mid = include $middleware))

-            $this->middleware = $mid;

-        elseif (is_array($middleware))

-            $this->middleware = $middleware;

-        else throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');

+        if (is_string($middleware)) {

+            $middleware = rtrim($middleware, '/');

+        }

+        if (is_file($middleware) && is_array($mid = include $middleware)) {

+                    $this->middleware = $mid;

+        } elseif (is_array($middleware)) {

+                    $this->middleware = $middleware;

+        } else {

+            throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');

+        }

     }

 

     /**

@@ -121,12 +144,13 @@ 
         $count = 0;

         for ($i = 0; $i < $this->countRoutes; ++$i) {

             $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';

-            if (isset($this->routes['routes_' . $i]))

-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {

+            if (isset($this->routes['routes_' . $i])) {

+                            foreach ($this->routes['routes_' . $i] as $route => $dependencies) {

                     if (is_array($dependencies) && isset($dependencies['use']))

                         $use = (is_object($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');

-                    else

-                        $use = (is_object($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');

+            } else {

+                                            $use = (is_object($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');

+                    }

                     (!is_object($dependencies) && isset($dependencies['name'])) ? $this->routesByName[$use . '#' . $dependencies['name']] = $root . $prefix . $route : $this->routesByName[$use] = $root . $prefix . $route;

                     $count++;

                 }

@@ -143,9 +167,14 @@ 
     {

         foreach ($this->routesByName as $key => $route) {

             $param = explode('#', $key);

-            foreach ($params as $key2 => $value) $route = str_replace(':' . $key2, $value, $route);

-            if ($param[0] == trim($name, '/')) return $route;

-            else if (isset($param[1]) && $param[1] == $name) return $route;

+            foreach ($params as $key2 => $value) {

+                $route = str_replace(':' . $key2, $value, $route);

+            }

+            if ($param[0] == trim($name, '/')) {

+                return $route;

+            } else if (isset($param[1]) && $param[1] == $name) {

+                return $route;

+            }

         }

         return null;

     }

src/Routing/Router.php

Braces +12 added lines, -7 removed lines

@@ -68,7 +68,9 @@ 
     public function run()

     {

         $this->setUrl();

-        if ($this->config['generateRoutesPath']) $this->collection->generateRoutesPath();

+        if ($this->config['generateRoutesPath']) {

+            $this->collection->generateRoutesPath();

+        }

         if ($this->match()) {

             $this->handle();

             $this->callTarget();

@@ -81,8 +83,9 @@ 
      */

     public function setUrl($url = null)

     {

-        if (is_null($url))

-            $url = (isset($_GET['url'])) ? $_GET['url'] : substr(str_replace(str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']), 1);

+        if (is_null($url)) {

+                    $url = (isset($_GET['url'])) ? $_GET['url'] : substr(str_replace(str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']), 1);

+        }

         $this->route->setUrl('/' . trim(explode('?', $url)[0], '/'));

     }

 

@@ -93,8 +96,9 @@ 
     {

         foreach ($this->config['matcher'] as $matcher) {

             $this->config['matcherInstance'][$matcher] = new $matcher($this);

-            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match']))

-                return true;

+            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match'])) {

+                            return true;

+            }

         }

         return false;

     }

@@ -137,8 +141,9 @@ 
         if (isset($this->route->getResponse()['templates']) && isset($this->route->getResponse()['templates'][$this->route->getResponse('code')])) {

             $this->route->setCallback($this->route->getResponse()['templates'][$this->route->getResponse('code')]);

             $matcher = $this->config['matcherInstance']['JetFire\Routing\Match\RoutesMatch'];

-            if (call_user_func([$matcher, 'anonymous']) || call_user_func([$matcher, 'mvc']) || call_user_func([$matcher, 'template']))

-                $this->callTarget();

+            if (call_user_func([$matcher, 'anonymous']) || call_user_func([$matcher, 'mvc']) || call_user_func([$matcher, 'template'])) {

+                            $this->callTarget();

+            }

         }

         http_response_code($this->route->getResponse('code'));

     }