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)

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

Tests/Router/RouterTest.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
             ->with($this->collection, $method, $path)
             ->willReturn($actual);
 
-        $expected = $this->router->getRouterResponseFromPath($method,$path);
+        $expected = $this->router->getRouterResponseFromPath($method, $path);
         $this->assertEquals($expected, $actual);
     }
 

Src/Router/RouterResponse.php

Spacing +4 added lines, -4 removed lines

@@ -100,7 +100,7 @@ 
      * @param string $handler
      * @return RouterResponse
      */
-    public function withHandler(string $handler){
+    public function withHandler(string $handler) {
         $new = clone $this;
         $new->handler = $handler;
         return $new;
@@ -110,7 +110,7 @@ 
      * @param array $vars
      * @return RouterResponse
      */
-    public function withVars(array $vars){
+    public function withVars(array $vars) {
         $new = clone $this;
         $new->vars = $vars;
         return $new;
@@ -120,7 +120,7 @@ 
      * @param int $code
      * @return RouterResponse
      */
-    public function withStatusCode(int $code){
+    public function withStatusCode(int $code) {
         $new = clone $this;
         $new->statusCode = $code;
         return $new;
@@ -130,7 +130,7 @@ 
      * @param array $names
      * @return RouterResponse
      */
-    public function withNames(array $names){
+    public function withNames(array $names) {
         $new = clone $this;
         $new->names = $names;
         return $new;

Src/Router/Router.php

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
         $this->adaptor = $adaptor;
         $this->collection = $collection;
 
-        if (isset($options['ignoreTrailingSlash'])){
+        if (isset($options['ignoreTrailingSlash'])) {
             $this->ignoreTrailingSlash = (bool)$options['ignoreTrailingSlash'];
         }
 
@@ -68,8 +68,8 @@ 
         $requestUri = $request->getUri()->getPath();
 
 
-        if ($this->ignoreTrailingSlash === true && $requestUri !== '/'){
-            $requestUri = rtrim($requestUri,'/');
+        if ($this->ignoreTrailingSlash === true && $requestUri !== '/') {
+            $requestUri = rtrim($requestUri, '/');
         }
 
         return $this->adaptor->match(
@@ -153,7 +153,7 @@ 
     /**
      * @param bool $ignore
      */
-    public function disableTrailingSlash($ignore = true){
+    public function disableTrailingSlash($ignore = true) {
         $this->ignoreTrailingSlash = $ignore;
     }
 }

Src/Router/RouteCollection.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
      */
     public function addNamespace(string $namespace)
     {
-        $formattedNamespace = '\\'.ltrim($namespace,'\\');
+        $formattedNamespace = '\\' . ltrim($namespace, '\\');
         $this->namespace[] = $formattedNamespace;
     }
 
@@ -230,8 +230,8 @@ 
 
         $route = \implode('', $this->group) . $routePattern;
 
-        if (substr($route, -1) === '/' && strlen($route) > 1){
-            $route = rtrim($route,'/');
+        if (substr($route, -1) === '/' && strlen($route) > 1) {
+            $route = rtrim($route, '/');
         }
 
         return $route;
@@ -253,7 +253,7 @@ 
                     )
                 );
                 $new->collection[] = $addRoute;
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 if ($throw) {
                     throw new RouteException($e->getMessage());
                 }

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
                  */
@@ -233,7 +233,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']);
                 }