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;

 

 /**

src/Routing/Match/RoutesMatch.php

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;

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/Route.php

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'] : [];

     }

 

     /**

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++;

     }

 

     /**