jetfirephp / routing

src/Routing/Router.php

Spacing +6 added lines, -6 removed lines

@@ -59,7 +59,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;
         };
     }
@@ -116,7 +116,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], '/'));
     }
 
     /**
@@ -170,10 +170,10 @@ 
                 }
             $this->response->setStatusCode($code);
         }
-        if (isset($this->collection->middleware['before_render'])){
-            foreach ($this->collection->middleware['before_render'] as $callback){
+        if (isset($this->collection->middleware['before_render'])) {
+            foreach ($this->collection->middleware['before_render'] as $callback) {
                 $call = explode('@', $callback);
-                if(isset($call[1])){
+                if (isset($call[1])) {
                     $classes = ['JetFire\Routing\Router' => $this];
                     $args = ['router' => $this, 'route' => $this->route, 'response' => $this->response];
                     $this->callMethod($call[0], $call[1], $args, $args, $classes);
@@ -221,7 +221,7 @@ 
     {
         $reflector = new ReflectionClass($controller);
         if (!$reflector->isInstantiable())
-            throw new \Exception('Controller [' . $controller . '] is not instantiable.');
+            throw new \Exception('Controller ['.$controller.'] is not instantiable.');
         $constructor = $reflector->getConstructor();
         if (is_null($constructor))
             return call_user_func_array($this->route->getTarget('di'), [$controller]);

Braces +39 added lines, -24 removed lines

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

+                    $matcher = [$matcher];

+        }

         $this->matcher = $matcher;
     }
 
@@ -104,8 +105,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();
     }
 
@@ -114,8 +119,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], '/'));
     }
 
@@ -125,7 +131,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;
     }
@@ -160,11 +168,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;
                 }
@@ -198,9 +211,9 @@ 
             $reflectionMethod = new ReflectionMethod($controller, $method);
             $dependencies = [];
             foreach ($reflectionMethod->getParameters() as $arg) {
-                if (isset($methodArgs[$arg->name]))
-                    array_push($dependencies, $methodArgs[$arg->name]);
-                else if (!is_null($arg->getClass())) {
+                if (isset($methodArgs[$arg->name])) {

+                                    array_push($dependencies, $methodArgs[$arg->name]);

+                } else if (!is_null($arg->getClass())) {
                     array_push($dependencies, call_user_func_array($this->route->getTarget('di'), [$arg->getClass()->name]));
                 }
             }
@@ -220,18 +233,20 @@ 
     public function callClass($controller, $ctrlArgs = [], $classInstance = [])
     {
         $reflector = new ReflectionClass($controller);
-        if (!$reflector->isInstantiable())
-            throw new \Exception('Controller [' . $controller . '] is not instantiable.');
+        if (!$reflector->isInstantiable()) {

+                    throw new \Exception('Controller [' . $controller . '] is not instantiable.');

+        }

         $constructor = $reflector->getConstructor();
-        if (is_null($constructor))
-            return call_user_func_array($this->route->getTarget('di'), [$controller]);
+        if (is_null($constructor)) {

+                    return call_user_func_array($this->route->getTarget('di'), [$controller]);

+        }

         $dependencies = [];
         foreach ($constructor->getParameters() as $arg) {
-            if (isset($ctrlArgs[$arg->name]))
-                array_push($dependencies, $ctrlArgs[$arg->name]);
-            else if (isset($classInstance[$arg->getClass()->name]))
-                array_push($dependencies, $classInstance[$arg->getClass()->name]);
-            else if (!is_null($arg->getClass())) {
+            if (isset($ctrlArgs[$arg->name])) {

+                            array_push($dependencies, $ctrlArgs[$arg->name]);

+            } else if (isset($classInstance[$arg->getClass()->name])) {

+                            array_push($dependencies, $classInstance[$arg->getClass()->name]);

+            } else if (!is_null($arg->getClass())) {
                 array_push($dependencies, call_user_func_array($this->route->getTarget('di'), [$arg->getClass()->name]));
             }
         }