djsmithme / Router

Src/Router/Dispatcher/Dispatcher.php

Doc Comments +5 added lines, -5 removed lines

@@ -182,7 +182,7 @@ 
     /**
      * Reflect Controller construct and get parameters.
      *
-     * @param $controllerName
+     * @param string $controllerName
      * @internal
      *
      * @return \ReflectionParameter[]
@@ -308,7 +308,7 @@ 
     /**
      * Checks controller instance against whitelist.
      *
-     * @param $controller
+     * @param string $controller
      * @param $options
      * @throws DispatchException
      */
@@ -342,7 +342,7 @@ 
     /**
      * Checks controller instance against blacklist.
      *
-     * @param $controller
+     * @param string $controller
      * @param $options
      * @throws DispatchException
      */
@@ -374,7 +374,7 @@ 
     /**
      * With Class Namespace.
      *
-     * @param $namespace
+     * @param string $namespace
      * @return Dispatcher
      */
     public function withNamespace($namespace)
@@ -387,7 +387,7 @@ 
     /**
      * With class Namespaces.
      *
-     * @param array $namespaces
+     * @param string[] $namespaces
      * @return Dispatcher
      */
     public function withNamespaces(array $namespaces)

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

Example/Routes/routes.php

Spacing +3 added lines, -3 removed lines

@@ -28,10 +28,10 @@ 
 $collection->addRoute('GET', '/path', 'myClass::myMethod', ['name']);
 $collection->addRoute('GET', '/another', 'another-handler', ['name']);
 
-$collection->group('/newPath', function () use ($collection, $something) {
+$collection->group('/newPath', function() use ($collection, $something) {
 
     //Add both POST and GET routes with Closure.
-    $collection->addRoute(['GET', 'POST'], '/new', function ($request) use ($something) {
+    $collection->addRoute(['GET', 'POST'], '/new', function($request) use ($something) {
         return $something;
     }, ['name']);
 
@@ -39,7 +39,7 @@ 
 
 $collection->addRoute('GET', '/mypath', 'handler::string', ['name']);
 
-$collection->addRoute('GET', '/someproduct', function ($request) {
+$collection->addRoute('GET', '/someproduct', function($request) {
     return 'this is my response for ';
 }, ['name']);
 

Tests/Router/Serializer/SuperClosureTest.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      */
     public function testSerializeCalled()
     {
-        $data = function () {
+        $data = function() {
             return true;
         };
 

Tests/Router/RouterResponseTest.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     {
         $this->handler = 'handler';
         $this->code = 200;
-        $this->names = ['name','name2'];
+        $this->names = ['name', 'name2'];
         $this->vars = ['a' => 1, 'b' =>2];
         $this->routerResponse = new RouterResponse($this->code, $this->handler, $this->names, $this->vars);
     }

Tests/Router/Loaders/Files/FileLoaderRoutesAlt.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 $collection = new \Ds\Router\RouteCollection();
 
-$collection->addRoute('GET', '/pathalt', function () use ($variable) {
+$collection->addRoute('GET', '/pathalt', function() use ($variable) {
     return $variable;
 }, ['name']);
 

Tests/Router/Loaders/Files/FileLoaderRoutes.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 $collection = new \Ds\Router\RouteCollection();
 
-$collection->addRoute('GET', '/path', function () use ($variable) {
+$collection->addRoute('GET', '/path', function() use ($variable) {
     return $variable;
 }, ['name']);
 

Tests/Router/RouteTest.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
     /**
      * @var array
      */
-    protected $expectedNames = ['name-1','name-2'];
+    protected $expectedNames = ['name-1', 'name-2'];
 
     /**
      * Route setUp.
@@ -81,7 +81,7 @@ 
      */
     public function testWithNames()
     {
-        $expected = ['foo','bar','baz'];
+        $expected = ['foo', 'bar', 'baz'];
         $route = $this->route->withNames($expected);
         $this->assertSame(
             $expected,
@@ -108,7 +108,7 @@ 
      */
     public function testWithHandlerClosure()
     {
-        $expected = function () {
+        $expected = function() {
             return 'closure';
         };
         $route = $this->route->withHandler($expected);
@@ -152,7 +152,7 @@ 
      */
     public function testGetHandlerTypeClosure()
     {
-        $closure = function () {
+        $closure = function() {
         };
         $expected = 'object';
         $route = $this->route->withHandler($closure);

Src/Router/Loaders/YamlLoader.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
                         $collection->addRoute($routeMethod, $route['path'], $route['handler'], $route['names']);
                     }
                 }
-            } catch (ParseException $e) {
+            }catch (ParseException $e) {
                 throw new RouterException($e->getMessage());
             }
 

Tests/Router/RouteCollectionTest.php

Spacing +10 added lines, -10 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);
@@ -245,11 +245,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']);
 
@@ -260,7 +260,7 @@ 
     /**
      * Test that the namespace is matched to the handler and returned.
      */
-    public function testFindHandlerNamespace(){
+    public function testFindHandlerNamespace() {
 
         $routeCollection = new RouteCollection();
         $routeCollection->addNamespace('\Rs\Router');
@@ -272,13 +272,13 @@ 
         $reflectionMethod->setAccessible(true);
         $actual = $reflectionMethod->invoke($routeCollection, $handler);
 
-        $this->assertEquals($expected,$actual);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
      * Test that backlash is added to start of namespace on response.
      */
-    public function testFindHandlerNamespaceNoBacklash(){
+    public function testFindHandlerNamespaceNoBacklash() {
 
         $routeCollection = new RouteCollection();
         $routeCollection->addNamespace('Rs\Router');
@@ -290,7 +290,7 @@ 
         $reflectionMethod->setAccessible(true);
         $actual = $reflectionMethod->invoke($routeCollection, $handler);
 
-        $this->assertEquals($expected,$actual);
+        $this->assertEquals($expected, $actual);
     }
 
 }