djsmithme / Router

Tests/Router/RouteCollectionTest.php

Spacing +7 added lines, -7 removed lines

@@ -33,9 +33,9 @@ 
     {
         $handler = 'my-handler';
         $routes = $this->collection;
-        $routes->group('/path', function () use ($routes, $handler) {
+        $routes->group('/path', function() use ($routes, $handler) {
             $routes->addRoute(['GET', 'POST'], '/foo', $handler, ['global']);
-            $routes->group('/sub-dir', function () use ($routes, $handler) {
+            $routes->group('/sub-dir', function() use ($routes, $handler) {
                 $routes->addRoute(['GET'], '/sub-page', $handler, ['sub-dir']);
             });
         });
@@ -175,7 +175,7 @@ 
     public function testMergeCollection()
     {
         $handler = 'handler::string';
-        $names = ['routes','names'];
+        $names = ['routes', 'names'];
         $collection = new RouteCollection();
         $collection->addRoute('GET', '/path', $handler, $names);
         $collection->addRoute('GET', '/another', $handler, $names);
@@ -194,7 +194,7 @@ 
     {
         $this->setExpectedException(RouteException::class);
         $handler = 'handler::string';
-        $names = ['routes','names'];
+        $names = ['routes', 'names'];
         $collection = new RouteCollection();
         $collection->addRoute('GET', '/path', $handler, $names);
         $collection->addRoute('GET', '/another', $handler, $names);
@@ -240,7 +240,7 @@ 
         $rawPattern = '/mypattern/';
         $expectedPattern = '/' . \ltrim($rawPattern, '/');
         $expected = \implode('', $groups) . $expectedPattern;
-        $expected = \rtrim($expected,'/');
+        $expected = \rtrim($expected, '/');
 
         $this->assertEquals($expected, $collection->formatRoutePattern($rawPattern));
     }
@@ -250,11 +250,11 @@ 
      */
     public function testMergeGroupNames()
     {
-        $expected = ['route-name','group-name'];
+        $expected = ['route-name', 'group-name'];
         $handler = 'myhandler';
         $routes = $this->collection;
 
-        $routes->group('/path', function () use ($routes, $handler) {
+        $routes->group('/path', function() use ($routes, $handler) {
             $routes->addRoute(['GET', 'POST'], '/foo', $handler, ['route-name']);
         }, ['group-name']);
 

Src/Router/Adaptor/RSymfonyAdaptor.php

Unused Use Statements -2 removed lines

@@ -14,8 +14,6 @@
 use Ds\Router\Interfaces\RouteInterface;
 use Ds\Router\Interfaces\SerializerInterface;
 use Ds\Router\RouterResponse;
-
-
 use Symfony\Component\Routing\Matcher\UrlMatcher;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     public function getSymfonyRouteCollection(RouteCollectionInterface $routes)
     {
 
-        if (!$this->options['cacheDisabled'] && file_exists($this->options['cacheFile'])){
+        if (!$this->options['cacheDisabled'] && file_exists($this->options['cacheFile'])) {
             //get cached route collection.
         }
 
@@ -99,7 +99,7 @@ 
             array('month' => '[0-9]{4}-[0-9]{2}'), // requirements
             array(), // options
             '', // host
-            array('https','https'), // schemes
+            array('https', 'https'), // schemes
             array('GET') // methods
         );
 

Src/Router/Adaptor/SymfonyAdaptor.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 use Ds\Router\Interfaces\RouteInterface;
 use Ds\Router\Interfaces\SerializerInterface;
 use Ds\Router\RouterResponse;
-
 use Symfony\Component\Routing\Matcher\UrlMatcher;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;

Src/Router/Adaptor/FastRouteAdaptor.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
         $this->options = $options;
 
         return \FastRoute\cachedDispatcher(
-            function (RouteCollector $fastRouteCollector) use ($routes) {
+            function(RouteCollector $fastRouteCollector) use ($routes) {
                 /**
                  * @var $route RouteInterface
                  */
@@ -228,7 +228,7 @@ 
             }
             $routes = (array)require $cacheFile;
             foreach ($routes[0] as $routeMethod => $routeData) {
-                foreach ($routeData as $routePattern => $routeContent){
+                foreach ($routeData as $routePattern => $routeContent) {
                     $routePath = \rtrim($context, '/') . DIRECTORY_SEPARATOR . \ltrim($routePattern, '/');
                     $collection->addRoute($routeMethod, $routePath, $routeContent['content'], $routeContent['name']);
                 }

Src/Router/Dispatcher/Dispatcher.php

Doc Comments +3 added lines, -3 removed lines

@@ -190,7 +190,7 @@ 
     /**
      * Reflect Controller construct and get parameters.
      *
-     * @param $controllerName
+     * @param string $controllerName
      * @internal
      *
      * @return \ReflectionParameter[]
@@ -321,7 +321,7 @@ 
     /**
      * Checks controller instance against whitelist.
      *
-     * @param $controller
+     * @param string $controller
      * @param $options
      * @throws DispatchException
      */
@@ -355,7 +355,7 @@ 
     /**
      * Checks controller instance against blacklist.
      *
-     * @param $controller
+     * @param string $controller
      * @param $options
      * @throws DispatchException
      */

Spacing +8 added lines, -8 removed lines

@@ -83,7 +83,7 @@ 
             case 'string':
 
                 $params = \explode($this->options['stringHandlerPattern'], $handler);
-                if (!isset($params[1])){
+                if (!isset($params[1])) {
                     $response = $handler;
                     break;
                 }
@@ -124,7 +124,7 @@ 
 
         try {
             $resolvedHandler['controller'] = $this->_findClass($controllerMethod[0]);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             throw new DispatchException($e->getMessage());
         }
 
@@ -175,7 +175,7 @@ 
 
         try {
             $this->_getParamsFromVariableName($args);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $this->_getParamsFromTypeHint($args);
         }
 
@@ -297,8 +297,8 @@ 
     protected function _callController(ServerRequestInterface $request, string $controller, string $method)
     {
 
-        if (!class_exists($controller)){
-            throw new DispatchException('Unable to locate controller: '.$controller);
+        if (!class_exists($controller)) {
+            throw new DispatchException('Unable to locate controller: ' . $controller);
         }
 
         $controllerObj = new $controller(...$this->providedArguments);
@@ -306,13 +306,13 @@ 
         try {
             $this->_checkWhiteList($controller, $this->options);
             $this->_checkBlackList($controller, $this->options);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             unset($controllerObj);
             throw new DispatchException($e->getMessage());
         }
 
-        if (!method_exists($controllerObj,$method)){
-            throw new DispatchException('Unable to locate method: '.$controller.'::'.$method);
+        if (!method_exists($controllerObj, $method)) {
+            throw new DispatchException('Unable to locate method: ' . $controller . '::' . $method);
         }
 
         return $controllerObj->{$method}($request);