jetfirephp / routing

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);
         }

Braces +17 added lines, -10 removed lines

@@ -86,7 +86,9 @@ 
     public function run()
     {
         $this->setUrl();
-        if ($this->config['generateRoutesPath']) $this->collection->generateRoutesPath();
+        if ($this->config['generateRoutesPath']) {

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

+        }

         if ($this->match()) {
             $this->handle();
             $this->callTarget();
@@ -99,8 +101,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], '/'));
     }
 
@@ -111,8 +114,9 @@ 
     {
         foreach ($this->config['matcher'] as $matcher) {
             $this->config['matcherInstance'][$matcher] = new $matcher($this);
-            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match']))
-                return true;
+            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match'])) {

+                            return true;

+            }

         }
         return false;
     }
@@ -157,12 +161,15 @@ 
     {
         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']))
-                foreach ($this->config['matcher'] as $matcher)
-                    $this->config['matcherInstance'][$matcher] = new $matcher($this);
+            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 (call_user_func([$instance, 'getMatcher']) as $match)
-                    if (call_user_func([$instance, $match])){ $this->callTarget(); break; }
+                foreach (call_user_func([$instance, 'getMatcher']) as $match) {

+                                    if (call_user_func([$instance, $match])){ $this->callTarget();

+                }

+                break; }
             }
             $this->response->setStatusCode($code);
         }