jetfirephp / routing

src/Routing/Response.php

Spacing +24 added lines, -24 removed lines

@@ -7,7 +7,7 @@ 
  * Class Response
  * @package JetFire\Routing
  */
-class Response implements ResponseInterface{
+class Response implements ResponseInterface {
 
     /**
      * @var array
@@ -53,7 +53,7 @@ 
     public static $statusTexts = array(
         100 => 'Continue',
         101 => 'Switching Protocols',
-        102 => 'Processing',            // RFC2518
+        102 => 'Processing', // RFC2518
         200 => 'OK',
         201 => 'Created',
         202 => 'Accepted',
@@ -61,9 +61,9 @@ 
         204 => 'No Content',
         205 => 'Reset Content',
         206 => 'Partial Content',
-        207 => 'Multi-Status',          // RFC4918
-        208 => 'Already Reported',      // RFC5842
-        226 => 'IM Used',               // RFC3229
+        207 => 'Multi-Status', // RFC4918
+        208 => 'Already Reported', // RFC5842
+        226 => 'IM Used', // RFC3229
         300 => 'Multiple Choices',
         301 => 'Moved Permanently',
         302 => 'Found',
@@ -71,7 +71,7 @@ 
         304 => 'Not Modified',
         305 => 'Use Proxy',
         307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',    // RFC7238
+        308 => 'Permanent Redirect', // RFC7238
         400 => 'Bad Request',
         401 => 'Unauthorized',
         402 => 'Payment Required',
@@ -90,26 +90,26 @@ 
         415 => 'Unsupported Media Type',
         416 => 'Range Not Satisfiable',
         417 => 'Expectation Failed',
-        418 => 'I\'m a teapot',                                               // RFC2324
-        422 => 'Unprocessable Entity',                                        // RFC4918
-        423 => 'Locked',                                                      // RFC4918
-        424 => 'Failed Dependency',                                           // RFC4918
-        425 => 'Reserved for WebDAV advanced collections expired proposal',   // RFC2817
-        426 => 'Upgrade Required',                                            // RFC2817
-        428 => 'Precondition Required',                                       // RFC6585
-        429 => 'Too Many Requests',                                           // RFC6585
-        431 => 'Request Header Fields Too Large',                             // RFC6585
+        418 => 'I\'m a teapot', // RFC2324
+        422 => 'Unprocessable Entity', // RFC4918
+        423 => 'Locked', // RFC4918
+        424 => 'Failed Dependency', // RFC4918
+        425 => 'Reserved for WebDAV advanced collections expired proposal', // RFC2817
+        426 => 'Upgrade Required', // RFC2817
+        428 => 'Precondition Required', // RFC6585
+        429 => 'Too Many Requests', // RFC6585
+        431 => 'Request Header Fields Too Large', // RFC6585
         500 => 'Internal Server Error',
         501 => 'Not Implemented',
         502 => 'Bad Gateway',
         503 => 'Service Unavailable',
         504 => 'Gateway Timeout',
         505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates (Experimental)',                      // RFC2295
-        507 => 'Insufficient Storage',                                        // RFC4918
-        508 => 'Loop Detected',                                               // RFC5842
-        510 => 'Not Extended',                                                // RFC2774
-        511 => 'Network Authentication Required',                             // RFC6585
+        506 => 'Variant Also Negotiates (Experimental)', // RFC2295
+        507 => 'Insufficient Storage', // RFC4918
+        508 => 'Loop Detected', // RFC5842
+        510 => 'Not Extended', // RFC2774
+        511 => 'Network Authentication Required', // RFC6585
     );
 
     /**
@@ -144,8 +144,8 @@ 
     public function __toString()
     {
         return
-            sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".
-            $this->headers."\r\n".
+            sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText) . "\r\n" .
+            $this->headers . "\r\n" .
             $this->getContent();
     }
 
@@ -166,8 +166,8 @@ 
      */
     public function sendHeaders()
     {
-        foreach($this->headers as $key => $content)
-            header($key.' : '.$content);
+        foreach ($this->headers as $key => $content)
+            header($key . ' : ' . $content);
         http_response_code($this->getStatusCode());
         return $this;
     }

src/Routing/Dispatcher/TemplateDispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response)
+    public function __construct(Route $route, ResponseInterface $response)
     {
         $this->route = $route;
         $this->response = $response;
@@ -58,7 +58,7 @@ 
     /**
      * @param $extension
      */
-    public function setContentType($extension){
+    public function setContentType($extension) {
         $this->response->setStatusCode(200);
         isset($this->types[$extension])
             ? $this->response->setHeaders(['Content-Type' => $this->types[$extension]])

src/Routing/Dispatcher/DispatcherInterface.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response);
+    public function __construct(Route $route, ResponseInterface $response);
 
     /**
      * @return mixed

src/Routing/Dispatcher/ClosureDispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response)
+    public function __construct(Route $route, ResponseInterface $response)
     {
         $this->route = $route;
         $this->response = $response;

src/Routing/Route.php

Spacing +3 added lines, -3 removed lines

@@ -127,7 +127,7 @@ 
      */
     public function setDetail($detail)
     {
-        $this->detail = array_merge($detail,$this->detail);
+        $this->detail = array_merge($detail, $this->detail);
     }
 
     /**
@@ -173,8 +173,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/Router.php

Spacing +9 added lines, -9 removed lines

@@ -46,13 +46,13 @@ 
      * @param ResponseInterface $response
      * @param Route $route
      */
-    public function __construct(RouteCollection $collection,ResponseInterface $response = null,Route $route = null)
+    public function __construct(RouteCollection $collection, ResponseInterface $response = null, Route $route = null)
     {
         $this->collection = $collection;
-        $this->response = is_null($response)? new Response() : $response;
+        $this->response = is_null($response) ? new Response() : $response;
         $this->response->setStatusCode(404);
-        $this->route = is_null($route)? new Route() : $route;
-        $this->config['di'] = function($class){
+        $this->route = is_null($route) ? new Route() : $route;
+        $this->config['di'] = function($class) {
             return new $class;
         };
     }
@@ -76,7 +76,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->config['matcher'][] = $matcher;
     }
 
@@ -123,7 +123,7 @@ 
     public function callTarget()
     {
         $target = $this->route->getTarget('dispatcher');
-        if(!empty($target)) {
+        if (!empty($target)) {
             $this->dispatcher = new $target($this->route, $this->response);
             return call_user_func([$this->dispatcher, 'call']);
         }
@@ -157,12 +157,12 @@ 
     {
         if (isset($this->route->getDetail()['response_templates']) && isset($this->route->getDetail()['response_templates'][$code = $this->response->getStatusCode()])) {
             $this->route->setCallback($this->route->getDetail()['response_templates'][$code]);
-            if(!isset($this->config['matcherInstance']))
+            if (!isset($this->config['matcherInstance']))
                 foreach ($this->config['matcher'] as $matcher)
                     $this->config['matcherInstance'][$matcher] = new $matcher($this);
-            foreach($this->config['matcherInstance'] as $instance) {
+            foreach ($this->config['matcherInstance'] as $instance) {
                 foreach (call_user_func([$instance, 'getMatcher']) as $match)
-                    if (call_user_func([$instance, $match])){ $this->callTarget(); break; }
+                    if (call_user_func([$instance, $match])) { $this->callTarget(); break; }
             }
             $this->response->setStatusCode($code);
         }

src/Routing/Matcher/ArrayMatcher.php

Spacing +13 added lines, -13 removed lines

@@ -24,7 +24,7 @@ 
     /**
      * @var array
      */
-    private $matcher = ['matchClosure','matchController','matchTemplate'];
+    private $matcher = ['matchClosure', 'matchController', 'matchTemplate'];
 
     /**
      * @var array
@@ -46,7 +46,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->matcher[] = $matcher;
     }
 
@@ -61,8 +61,8 @@ 
     /**
      * @param array $dispatcher
      */
-    public function setDispatcher($dispatcher = []){
-        $this->dispatcher = array_merge($dispatcher,$this->dispatcher);
+    public function setDispatcher($dispatcher = []) {
+        $this->dispatcher = array_merge($dispatcher, $this->dispatcher);
     }
 
     /**
@@ -122,7 +122,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->matchClosure();
@@ -135,11 +135,11 @@ 
                     ? $this->router->route->setCallback($this->request['path']['use'])
                     : $this->router->route->setCallback($this->request['path']);
             $this->router->route->setDetail($this->request);
-            if($this->validMethod()) {
-                foreach($this->matcher as $matcher)
-                    call_user_func([$this,$matcher]);
+            if ($this->validMethod()) {
+                foreach ($this->matcher as $matcher)
+                    call_user_func([$this, $matcher]);
                 $this->router->response->setStatusCode(202);
-            }else
+            } else
                 $this->router->response->setStatusCode(405);
         }
         return $this->router->route->hasTarget();
@@ -181,7 +181,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])) {
@@ -209,7 +209,7 @@ 
             $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;
@@ -225,7 +225,7 @@ 
                 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;
                         $extension = explode('.', $ext);
                         $extension = end($extension);
@@ -239,7 +239,7 @@ 
                         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/Matcher/UriMatcher.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
     /**
      * @var array
      */
-    private $matcher = ['matchController','matchTemplate'];
+    private $matcher = ['matchController', 'matchTemplate'];
 
     private $dispatcher = [
         'matchTemplate' => 'JetFire\Routing\Dispatcher\TemplateDispatcher',
@@ -38,7 +38,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->matcher[] = $matcher;
     }
 
@@ -55,7 +55,7 @@ 
      */
     public function setDispatcher($dispatcher = [])
     {
-        $this->dispatcher = array_merge($dispatcher,$this->dispatcher);
+        $this->dispatcher = array_merge($dispatcher, $this->dispatcher);
     }
 
     /**
@@ -63,8 +63,8 @@ 
      */
     public function match()
     {
-        foreach($this->matcher as $matcher){
-            if(call_user_func([$this,$matcher])) {
+        foreach ($this->matcher as $matcher) {
+            if (call_user_func([$this, $matcher])) {
                 $this->router->response->setStatusCode(202);
                 return true;
             }
@@ -79,9 +79,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' => $this->dispatcher['matchTemplate'],
@@ -104,11 +104,11 @@ 
     {
         $routes = array_slice(explode('/', $this->router->route->getUrl()), 1);
         $i = 0;
-        do{
-            $route =  ('/' . $routes[0] == $this->router->collection->getRoutes('prefix_' . $i)) ? array_slice($routes, 1) : $routes;
+        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([
@@ -123,7 +123,7 @@ 
                 }
             }
             ++$i;
-        }while($i < $this->router->collection->countRoutes);
+        }while ($i < $this->router->collection->countRoutes);
         return false;
     }
 

src/Routing/RouteCollection.php

Spacing +12 added lines, -12 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++;
     }
 
     /**
@@ -105,7 +105,7 @@ 
     public function setMiddleware($middleware)
     {
         if (is_string($middleware)) $middleware = rtrim($middleware, '/');
-        if(is_array($middleware))
+        if (is_array($middleware))
             $this->middleware = $middleware;
         elseif (is_file($middleware) && is_array($mid = include $middleware))
             $this->middleware = $mid;
@@ -117,7 +117,7 @@ 
      */
     public function generateRoutesPath()
     {
-        $root = 'http://' . (isset($_SERVER['HTTP_HOST'])?$_SERVER['HTTP_HOST']:$_SERVER['SERVER_NAME']) . str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']);
+        $root = 'http://' . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']) . str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']);
         $count = 0;
         for ($i = 0; $i < $this->countRoutes; ++$i) {
             $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';
@@ -125,7 +125,7 @@ 
                 foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
                     if (is_array($dependencies) && isset($dependencies['use']))
                         $use = (is_callable($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
-                    elseif(!is_array($dependencies))
+                    elseif (!is_array($dependencies))
                         $use = (is_callable($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
                     else
                         $use = $route;