jetfirephp / routing

src/Routing/Router.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
         $this->response->setStatusCode(404);
         $this->route = is_null($route) ? new Route() : $route;
         $this->middleware = new Middleware($this);
-        $this->config['di'] = function ($class) {
+        $this->config['di'] = function($class) {
             return new $class;
         };
     }
@@ -114,7 +114,7 @@ 
     {
         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], '/'));
+        $this->route->setUrl('/'.trim(explode('?', $url)[0], '/'));
     }
 
     /**

Braces +25 added lines, -12 removed lines

@@ -83,8 +83,9 @@ 
      */
     public function setMatcher($matcher)
     {
-        if (is_object($matcher))
-            $matcher = [$matcher];
+        if (is_object($matcher)) {

+                    $matcher = [$matcher];

+        }

         $this->matcher = $matcher;
     }
 
@@ -102,8 +103,12 @@ 
     public function run()
     {
         $this->setUrl();
-        if ($this->config['generateRoutesPath']) $this->collection->generateRoutesPath();
-        if ($this->match()) $this->callTarget();
+        if ($this->config['generateRoutesPath']) {

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

+        }

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

+            $this->callTarget();

+        }

         $this->callResponse();
     }
 
@@ -112,8 +117,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], '/'));
     }
 
@@ -123,7 +129,9 @@ 
     public function match()
     {
         foreach ($this->matcher as $key => $matcher) {
-            if (call_user_func([$this->matcher[$key], 'match'])) return true;
+            if (call_user_func([$this->matcher[$key], 'match'])) {

+                return true;

+            }

         }
         return false;
     }
@@ -158,11 +166,16 @@ 
         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]);
             $matcher = null;
-            foreach ($this->matcher as $instance) if ($instance instanceof ArrayMatcher) $matcher = $instance;
-            if (is_null($matcher)) $matcher = new ArrayMatcher($this);
-            foreach (call_user_func([$matcher, 'getResolver']) as $match)
-                if (is_array($target = call_user_func_array([$matcher, $match], [$this->route->getCallback()]))) {
-                    call_user_func_array([$matcher, 'setTarget'], [$target]);
+            foreach ($this->matcher as $instance) {

+                if ($instance instanceof ArrayMatcher) $matcher = $instance;

+            }

+            if (is_null($matcher)) {

+                $matcher = new ArrayMatcher($this);

+            }

+            foreach (call_user_func([$matcher, 'getResolver']) as $match) {

+                            if (is_array($target = call_user_func_array([$matcher, $match], [$this->route->getCallback()]))) {
+                    call_user_func_array([$matcher, 'setTarget'], [$target]);

+            }

                     $this->callTarget();
                     break;
                 }

src/Routing/Dispatcher/ControllerDispatcher.php

Spacing +8 added lines, -8 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;
@@ -47,18 +47,18 @@ 
                 ? $count++
                 : $dependencies[] = call_user_func_array($this->route->getTarget('di'), [$arg->getClass()->name]);
         }
-        if($count == count($this->route->getParameters()) || ($this->route->getParameters() == '' && $count == 0)) {
+        if ($count == count($this->route->getParameters()) || ($this->route->getParameters() == '' && $count == 0)) {
             $dependencies = array_merge($dependencies, ($this->route->getParameters() == '') ? [] : $this->route->getParameters());
             if ($this->response->getStatusCode() == 202)
                 $this->response->setStatusCode(200);
-            if (is_array($content = $reflectionMethod->invokeArgs($this->getController(), $dependencies))){
+            if (is_array($content = $reflectionMethod->invokeArgs($this->getController(), $dependencies))) {
                 $this->route->addTarget('data', $content);
-                if(isset($this->route->getParams()['ajax']) && $this->route->getParams()['ajax'] == true){
+                if (isset($this->route->getParams()['ajax']) && $this->route->getParams()['ajax'] == true) {
                     $this->response->setContent(json_encode($content));
                     $this->response->setHeaders(['Content-Type' => 'application/json']);
                 }
             } elseif (!is_null($content)) $this->response->setContent($content);
-        }else
+        } else
             $this->response->setStatusCode(404);
     }
 
@@ -71,17 +71,17 @@ 
     {
         $reflector = new ReflectionClass($this->route->getTarget('controller'));
         if (!$reflector->isInstantiable())
-            throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');
+            throw new \Exception('Target ['.$this->route->getTarget('controller').'] is not instantiable.');
         $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);
     }

Braces +12 added lines, -7 removed lines

@@ -49,17 +49,21 @@ 
         }
         if($count == count($this->route->getParameters()) || ($this->route->getParameters() == '' && $count == 0)) {
             $dependencies = array_merge($dependencies, ($this->route->getParameters() == '') ? [] : $this->route->getParameters());
-            if ($this->response->getStatusCode() == 202)
-                $this->response->setStatusCode(200);
+            if ($this->response->getStatusCode() == 202) {

+                            $this->response->setStatusCode(200);

+            }

             if (is_array($content = $reflectionMethod->invokeArgs($this->getController(), $dependencies))){
                 $this->route->addTarget('data', $content);
                 if(isset($this->route->getParams()['ajax']) && $this->route->getParams()['ajax'] == true){
                     $this->response->setContent(json_encode($content));
                     $this->response->setHeaders(['Content-Type' => 'application/json']);
                 }
-            } elseif (!is_null($content)) $this->response->setContent($content);
-        }else
-            $this->response->setStatusCode(404);
+            } elseif (!is_null($content)) {

+                $this->response->setContent($content);

+            }

+        } else {

+                    $this->response->setStatusCode(404);

+        }

     }
 
 
@@ -70,8 +74,9 @@ 
     private function getController()
     {
         $reflector = new ReflectionClass($this->route->getTarget('controller'));
-        if (!$reflector->isInstantiable())
-            throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');
+        if (!$reflector->isInstantiable()) {

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

+        }

         $constructor = $reflector->getConstructor();
         if (is_null($constructor)) {
             $class = $this->route->getTarget('controller');

src/Routing/Dispatcher/TemplateDispatcher.php

Braces +12 added lines, -7 removed lines

@@ -47,14 +47,19 @@
      */
     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();
-            if (isset($this->route->getTarget()['data'])) extract($this->route->getTarget('data'));
-            if (isset($this->route->getParams()['data'])) extract($this->route->getParams()['data']);
+            if (isset($this->route->getTarget()['data'])) {

+                extract($this->route->getTarget('data'));

+            }

+            if (isset($this->route->getParams()['data'])) {

+                extract($this->route->getParams()['data']);

+            }

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