jetfirephp / routing

src/Routing/RouteCollection.php

Spacing +11 added lines, -11 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['view_dir_' . $this->countRoutes] = (isset($options['view_dir']) && !empty($options['view_dir'])) ? rtrim($options['view_dir'], '/') . '/' : '';
@@ -62,8 +62,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;
     }
 
@@ -79,7 +79,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++;
     }
 
     /**
@@ -89,15 +89,15 @@ 
     {
         $nbrArgs = count($args);
         for ($i = 0; $i < $nbrArgs; ++$i) {
-            if(is_array($args[$i])){
+            if (is_array($args[$i])) {
                 $this->routes['block_' . $i] = (isset($args[$i]['block']) && !empty($args[$i]['block'])) ? rtrim($args[$i]['block'], '/') . '/' : '';
                 $this->routes['view_dir_' . $i] = (isset($args[$i]['view_dir']) && !empty($args[$i]['view_dir'])) ? rtrim($args[$i]['view_dir'], '/') . '/' : '';
                 $this->routes['ctrl_namespace_' . $i] = (isset($args[$i]['ctrl_namespace']) && !empty($args[$i]['ctrl_namespace'])) ? trim($args[$i]['ctrl_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++;
     }
 
     /**
@@ -119,7 +119,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] : '';
@@ -127,7 +127,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;

src/Routing/Middleware.php

Spacing +5 added lines, -5 removed lines

@@ -76,8 +76,8 @@ 
      * @param $class
      * @return mixed
      */
-    private function callHandler($class){
-        $instance = call_user_func($this->router->getConfig()['di'],$class);
+    private function callHandler($class) {
+        $instance = call_user_func($this->router->getConfig()['di'], $class);
         if (method_exists($instance, 'handle')) {
             $reflectionMethod = new ReflectionMethod($instance, 'handle');
             $dependencies = [];
@@ -93,8 +93,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;
@@ -105,7 +105,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;
         }
     }