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/Matcher/ArrayMatcher.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 +16 added lines, -16 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,7 +61,7 @@ 
     /**
      * @param array $dispatcher
      */
-    public function setDispatcher($dispatcher = []){
+    public function setDispatcher($dispatcher = []) {
         $this->dispatcher = $dispatcher;
     }
 
@@ -71,7 +71,7 @@ 
      * @return mixed|void
      * @internal param array $dispatcher
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -133,14 +133,14 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod()) {
-            foreach($this->matcher as $match)
-                if(call_user_func_array([$this,$match],[$this->router->route->getCallback()])) break;
+        if ($this->validMethod()) {
+            foreach ($this->matcher as $match)
+                if (call_user_func_array([$this, $match], [$this->router->route->getCallback()])) 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->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
+        } else
             $this->router->response->setStatusCode(405);
         return $this->router->route->hasTarget();
     }
@@ -148,9 +148,9 @@ 
     /**
      *
      */
-    private function setRoute(){
+    private function setRoute() {
         if (isset($this->request['params'])) {
-            if(is_callable($this->request['params']))
+            if (is_callable($this->request['params']))
                 $this->router->route->setCallback($this->request['params']);
             else {
                 (is_array($this->request['params']) && isset($this->request['params']['use']))
@@ -168,7 +168,7 @@ 
      */
     public function validMethod()
     {
-        if(is_callable($this->request['params']))return true;
+        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'];
@@ -205,7 +205,7 @@ 
             $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];
+                : $this->router->collection->getRoutes()['ctrl_namespace_' . $index] . $routes[0];
             if (!class_exists($class))
                 throw new \Exception('Class "' . $class . '." is not found');
             if (method_exists($class, $routes[1])) {
@@ -229,7 +229,7 @@ 
      */
     public function matchTemplate($callback)
     {
-        if(is_string($callback)) {
+        if (is_string($callback)) {
             $path = trim($callback, '/');
             $extension = substr(strrchr($path, "."), 1);
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
@@ -246,7 +246,7 @@ 
                     }
                 }
             }
-            if(is_null($target))
+            if (is_null($target))
                 throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
             $this->router->route->setTarget([
                 'dispatcher' => $this->dispatcher['matchTemplate'],

src/Routing/Dispatcher/ControllerDispatcher.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response)
+    public function __construct(Route $route, ResponseInterface $response)
     {
         $this->route = $route;
         $this->response = $response;
@@ -44,8 +44,8 @@ 
         $dependencies = [];
         foreach ($reflectionMethod->getParameters() as $arg)
             if (!is_null($arg->getClass()))
-                $dependencies[] = call_user_func_array($this->route->getTarget('di'),[$arg->getClass()->name]);
-        $dependencies = array_merge($dependencies,($this->route->getParameters() == '') ? [] : $this->route->getParameters());
+                $dependencies[] = call_user_func_array($this->route->getTarget('di'), [$arg->getClass()->name]);
+        $dependencies = array_merge($dependencies, ($this->route->getParameters() == '') ? [] : $this->route->getParameters());
         if ($this->response->getStatusCode() == 202)
             $this->response->setStatusCode(200);
         return $this->response->setContent($reflectionMethod->invokeArgs($this->getController(), $dependencies));
@@ -64,13 +64,13 @@ 
         $constructor = $reflector->getConstructor();
         if (is_null($constructor)) {
             $class = $this->route->getTarget('controller');
-            return call_user_func_array($this->route->getTarget('di'),[$class]);
+            return call_user_func_array($this->route->getTarget('di'), [$class]);
         }
         $dependencies = $constructor->getParameters();
         $arguments = [];
         foreach ($dependencies as $dep) {
             $class = $dep->getClass()->name;
-            array_push($arguments, call_user_func_array($this->route->getTarget('di'),[$class]));
+            array_push($arguments, call_user_func_array($this->route->getTarget('di'), [$class]));
         }
         return $reflector->newInstanceArgs($arguments);
     }

src/Routing/Middleware.php

Spacing +9 added lines, -9 removed lines

@@ -32,7 +32,7 @@ 
         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);
+                    $mid_global = call_user_func($this->router->getConfig()['di'], $mid);
                     if (method_exists($mid_global, 'handle')) $this->callHandler($mid_global);
                 }
             }
@@ -46,7 +46,7 @@ 
         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 = call_user_func($this->router->getConfig()['di'],$class);
+                $mid_block = call_user_func($this->router->getConfig()['di'], $class);
                 if (method_exists($mid_block, 'handle')) $this->callHandler($mid_block);
             }
     }
@@ -60,7 +60,7 @@ 
             $ctrl = str_replace('\\', '/', $this->router->route->getTarget('controller'));
             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);
+                $mid_class = call_user_func($this->router->getConfig()['di'], $class);
                 if (method_exists($mid_class, 'handle')) $this->callHandler($mid_class);
             }
         }
@@ -74,7 +74,7 @@ 
         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);
+                $mid_route = call_user_func($this->router->getConfig()['di'], $class);
                 if (method_exists($mid_route, 'handle')) $this->callHandler($mid_route);
             }
     }
@@ -83,13 +83,13 @@ 
      * @param $instance
      * @return mixed
      */
-    private function callHandler($instance){
+    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);
-        $dependencies = array_merge($dependencies,[$this->router->route]);
+        $dependencies = array_merge($dependencies, [$this->router->route]);
         return $reflectionMethod->invokeArgs($instance, $dependencies);
     }
 
@@ -97,8 +97,8 @@ 
      * @param $class
      * @return Route|RouteCollection|Router|mixed
      */
-    private function getClass($class){
-        switch($class){
+    private function getClass($class) {
+        switch ($class) {
             case 'JetFire\Routing\Route':
                 return $this->router->route;
                 break;
@@ -109,7 +109,7 @@ 
                 return $this->router->collection;
                 break;
             default:
-                return call_user_func_array($this->router->getConfig()['di'],[$class]);
+                return call_user_func_array($this->router->getConfig()['di'], [$class]);
                 break;
         }
     }

src/Routing/Matcher/MatcherInterface.php

Spacing +1 added lines, -1 removed lines

@@ -41,5 +41,5 @@
      * @param $class
      * @return mixed
      */
-    public function addDispatcher($method,$class);
+    public function addDispatcher($method, $class);
 }