burzum / php-router

spec/Suite/Parser.spec.php

Spacing +26 added lines, -26 removed lines

@@ -7,13 +7,13 @@ 
 use Lead\Router\Exception\ParserException;
 use Lead\Router\Parser;
 
-describe("Parser", function () {
+describe("Parser", function() {
 
 
-    describe("::tokenize()", function () {
+    describe("::tokenize()", function() {
 
 
-        it("parses an empty url", function () {
+        it("parses an empty url", function() {
 
 
             $result = Parser::tokenize('');
@@ -25,7 +25,7 @@ 
                 'tokens'   => []
             ]);
         });
-        it("parses a static url", function () {
+        it("parses a static url", function() {
 
 
             $result = Parser::tokenize('/test');
@@ -37,7 +37,7 @@ 
                 'tokens'   => ['/test']
             ]);
         });
-        it("parses an url with a variable", function () {
+        it("parses an url with a variable", function() {
 
 
             $result = Parser::tokenize('/test/{param}');
@@ -55,7 +55,7 @@ 
                 ]
             ]);
         });
-        it("parses an url with several variables", function () {
+        it("parses an url with several variables", function() {
 
 
             $result = Parser::tokenize('/test/{param1}/test2/{param2}');
@@ -78,7 +78,7 @@ 
                 ]
             ]);
         });
-        it("parses an url with a variable with a custom regex", function () {
+        it("parses an url with a variable with a custom regex", function() {
 
 
             $result = Parser::tokenize('/test/{param:\d+}');
@@ -96,7 +96,7 @@ 
                 ]
             ]);
         });
-        it("parses an url with an optional segment", function () {
+        it("parses an url with an optional segment", function() {
 
 
             $result = Parser::tokenize('/test[opt]');
@@ -119,7 +119,7 @@ 
                 ]
             ]);
         });
-        it("parses an optional segment", function () {
+        it("parses an optional segment", function() {
 
 
             $result = Parser::tokenize('[test]');
@@ -141,7 +141,7 @@ 
                 ]
             ]);
         });
-        it("parses an optional segment inside a route definition", function () {
+        it("parses an optional segment inside a route definition", function() {
 
 
             $result = Parser::tokenize('/test[/opt]/required');
@@ -165,7 +165,7 @@ 
                 ]
             ]);
         });
-        it("parses an url with an optional variable", function () {
+        it("parses an url with an optional variable", function() {
 
 
             $result = Parser::tokenize('/test[/{param}]');
@@ -192,7 +192,7 @@ 
                 ]
             ]);
         });
-        it("parses an url with a variable with a prefix and a suffix inside an optional segment", function () {
+        it("parses an url with a variable with a prefix and a suffix inside an optional segment", function() {
 
 
             $result = Parser::tokenize('/test[/:{param}:]');
@@ -220,7 +220,7 @@ 
                 ]
             ]);
         });
-        it("parses an url with a variable and an optional segment", function () {
+        it("parses an url with a variable and an optional segment", function() {
 
 
             $result = Parser::tokenize('/{param}[opt]');
@@ -247,7 +247,7 @@ 
                 ]
             ]);
         });
-        it("parses nested segments", function () {
+        it("parses nested segments", function() {
 
 
             $result = Parser::tokenize('/test[/{name}[/{id:[0-9]+}]]');
@@ -287,25 +287,25 @@ 
                 ]
             ]);
         });
-        it("throws an exception when there's a missing closing square bracket", function () {
+        it("throws an exception when there's a missing closing square bracket", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 Parser::tokenize('/test[opt');
             };
             expect($closure)->toThrow(ParserException::squareBracketMismatch());
-            $closure = function () {
+            $closure = function() {
 
                 Parser::tokenize('/test[opt[opt2]');
             };
             expect($closure)->toThrow(ParserException::squareBracketMismatch());
         });
     });
-    describe("::compile()", function () {
+    describe("::compile()", function() {
 
 
-        it("compiles a tokens structure", function () {
+        it("compiles a tokens structure", function() {
 
 
             $token = Parser::tokenize('/test[/{name}[/{id:[0-9]+}]]');
@@ -314,7 +314,7 @@ 
                 '/test(?:/([^/]+)(?:/([0-9]+))?)?', ['name' => false, 'id' => false]
             ]);
         });
-        it("compiles a tokens structure with repeatable patterns", function () {
+        it("compiles a tokens structure with repeatable patterns", function() {
 
 
             $tokens = Parser::tokenize('/test[/{name}[/{id:[0-9]+}]*]');
@@ -323,28 +323,28 @@ 
                 '/test(?:/([^/]+)((?:/[0-9]+)*))?', ['name' => false, 'id' => '/{id:[0-9]+}']
             ]);
         });
-        it("throws an exception when a placeholder is present several time", function () {
+        it("throws an exception when a placeholder is present several time", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 Parser::compile(Parser::tokenize('/test/{var}/{var}'));
             };
             expect($closure)->toThrow(ParserException::duplicatePlaceholder('var'));
         });
-        it("throws an exception when a placeholder is present several time through different segments", function () {
+        it("throws an exception when a placeholder is present several time through different segments", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 Parser::compile(Parser::tokenize('/test/{var}[/{var}]'));
             };
             expect($closure)->toThrow(ParserException::duplicatePlaceholder('var'));
         });
-        it("throws an exception when multiple placeholder are present in repeatable segments", function () {
+        it("throws an exception when multiple placeholder are present in repeatable segments", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 Parser::compile(Parser::tokenize('/test[/{var1}/{var2}]*'));
             };

src/Scope.php

Spacing +4 added lines, -4 removed lines

@@ -94,12 +94,12 @@ 
         $scope = $this->scope;
 
         if (!empty($options['name'])) {
-            $options['name'] = $scope['name'] ? $scope['name'] . '.' . $options['name'] : $options['name'];
+            $options['name'] = $scope['name'] ? $scope['name'].'.'.$options['name'] : $options['name'];
         }
 
         if (!empty($options['prefix'])) {
-            $options['prefix'] = $scope['prefix'] . trim($options['prefix'], '/');
-            $options['prefix'] = $options['prefix'] ? $options['prefix'] . '/' : '';
+            $options['prefix'] = $scope['prefix'].trim($options['prefix'], '/');
+            $options['prefix'] = $options['prefix'] ? $options['prefix'].'/' : '';
         }
 
         if (isset($options['persist'])) {
@@ -107,7 +107,7 @@ 
         }
 
         if (isset($options['namespace'])) {
-            $options['namespace'] = $scope['namespace'] . trim($options['namespace'], '\\') . '\\';
+            $options['namespace'] = $scope['namespace'].trim($options['namespace'], '\\').'\\';
         }
 
         return $options + $scope;

src/Parser.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
     public static function tokenize(string $pattern, string $delimiter = '/'): array
     {
         // Checks if the pattern has some optional segments.
-        if (count(preg_split('~' . static::PLACEHOLDER_REGEX . '(*SKIP)(*F)|\[~x', $pattern)) > 1) {
+        if (count(preg_split('~'.static::PLACEHOLDER_REGEX.'(*SKIP)(*F)|\[~x', $pattern)) > 1) {
             $tokens = static::_tokenizePattern($pattern, $delimiter);
         } else {
             $tokens = static::tokenizeSegment($pattern, $delimiter);
@@ -143,7 +143,7 @@ 
         $tokens = [];
         $index = 0;
         $path = '';
-        if (preg_match_all('~' . static::PLACEHOLDER_REGEX . '()~x', $pattern, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+        if (preg_match_all('~'.static::PLACEHOLDER_REGEX.'()~x', $pattern, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
             foreach ($matches as $match) {
                 $offset = $match[0][1];
                 $path .= substr($pattern, $index, $offset - $index);
@@ -154,7 +154,7 @@ 
                 }
 
                 $variable = $match[1][0];
-                $capture = $match[2][0] ?: '[^' . $delimiter . ']+';
+                $capture = $match[2][0] ?: '[^'.$delimiter.']+';
                 $tokens[] = [
                     'name'      => $variable,
                     'pattern'   => $capture
@@ -259,9 +259,9 @@ 
                     if (count($rule[1]) > 1) {
                         throw ParserException::placeholderExceeded();
                     }
-                    $regex .= '((?:' . $rule[0] . ')' . $child['greedy'] . ')';
+                    $regex .= '((?:'.$rule[0].')'.$child['greedy'].')';
                 } elseif ($child['optional']) {
-                    $regex .= '(?:' . $rule[0] . ')?';
+                    $regex .= '(?:'.$rule[0].')?';
                 }
                 foreach ($rule[1] as $name => $pattern) {
                     if (isset($variables[$name])) {
@@ -279,7 +279,7 @@ 
                     $regex .= $child['pattern'];
                 } else {
                     $variables[$name] = false;
-                    $regex .= '(' . $child['pattern'] . ')';
+                    $regex .= '('.$child['pattern'].')';
                 }
             }
         }

Indentation +6 added lines, -6 removed lines

@@ -70,12 +70,12 @@
 \}
 EOD;
 /**
-     * Tokenizes a route pattern. Optional segments are identified by square brackets.
-     *
-     * @param string $pattern A route pattern
-     * @param string $delimiter The path delimiter.
-     * @return array
-     */
+ * Tokenizes a route pattern. Optional segments are identified by square brackets.
+ *
+ * @param string $pattern A route pattern
+ * @param string $delimiter The path delimiter.
+ * @return array
+ */
     public static function tokenize(string $pattern, string $delimiter = '/'): array
     {
         // Checks if the pattern has some optional segments.

src/RouteInterface.php

Indentation +11 added lines, -11 removed lines

@@ -81,17 +81,17 @@
     public function match($request, &$variables = null, &$hostVariables = null): bool;
 
     /**
-      * Returns the route's link.
-      *
-      * @param  array $params  The route parameters.
-      * @param  array $options Options for generating the proper prefix. Accepted values are:
-      *                        - `'absolute'` _boolean_: `true` or `false`. - `'scheme'`
-      *                        _string_ : The scheme. - `'host'`     _string_ : The host
-      *                        name. - `'basePath'` _string_ : The base path. - `'query'`
-      *                        _string_ : The query string. - `'fragment'` _string_ : The
-      *                        fragment string.
-      * @return string          The link.
-      */
+     * Returns the route's link.
+     *
+     * @param  array $params  The route parameters.
+     * @param  array $options Options for generating the proper prefix. Accepted values are:
+     *                        - `'absolute'` _boolean_: `true` or `false`. - `'scheme'`
+     *                        _string_ : The scheme. - `'host'`     _string_ : The host
+     *                        name. - `'basePath'` _string_ : The base path. - `'query'`
+     *                        _string_ : The query string. - `'fragment'` _string_ : The
+     *                        fragment string.
+     * @return string          The link.
+     */
     public function link(array $params = [], array $options = []): string;
 
     /**

spec/Suite/Route.spec.php

Spacing +44 added lines, -44 removed lines

@@ -11,13 +11,13 @@ 
 use Lead\Router\Router;
 use Lead\Router\Route;
 
-describe("Route", function () {
+describe("Route", function() {
 
 
-    describe("->pattern()", function () {
+    describe("->pattern()", function() {
 
 
-        it("gets/sets the pattern", function () {
+        it("gets/sets the pattern", function() {
 
 
             $route = new Route();
@@ -29,7 +29,7 @@ 
                 'paths' => '/{paths}'
             ]);
         });
-        it("updates the regex", function () {
+        it("updates the regex", function() {
 
 
             $route = new Route();
@@ -38,7 +38,7 @@ 
             expect($route->setPattern('/foo/baz/{id}[/{paths}]*'))->toBe($route);
             expect($route->Regex())->toBe('/foo/baz/([^/]+)((?:/[^/]+)*)');
         });
-        it("updates the variables", function () {
+        it("updates the variables", function() {
 
 
             $route = new Route();
@@ -54,10 +54,10 @@ 
             ]);
         });
     });
-    describe("->scope()", function () {
+    describe("->scope()", function() {
 
 
-        it("gets/sets route scope", function () {
+        it("gets/sets route scope", function() {
 
 
             $scope = new Scope();
@@ -66,17 +66,17 @@ 
             expect($route->Scope())->toBe($scope);
         });
     });
-    describe("->methods()", function () {
+    describe("->methods()", function() {
 
 
-        it("gets/sets route methods", function () {
+        it("gets/sets route methods", function() {
 
 
             $route = new Route();
             expect($route->setMethods(['POST', 'PUT']))->toBe($route);
             expect($route->Methods())->toBe(['POST', 'PUT']);
         });
-        it("formats method names", function () {
+        it("formats method names", function() {
 
 
             $route = new Route();
@@ -84,17 +84,17 @@ 
             expect($route->Methods())->toBe(['POST', 'PUT']);
         });
     });
-    describe("->allow()", function () {
+    describe("->allow()", function() {
 
 
-        it("adds some extra allowed methods", function () {
+        it("adds some extra allowed methods", function() {
 
 
             $route = new Route(['methods' => []]);
             expect($route->allow(['POST', 'PUT']))->toBe($route);
             expect($route->Methods())->toBe(['POST', 'PUT']);
         });
-        it("formats newly allowed method names", function () {
+        it("formats newly allowed method names", function() {
 
 
             $route = new Route(['methods' => []]);
@@ -102,39 +102,39 @@ 
             expect($route->Methods())->toBe(['POST', 'PUT']);
         });
     });
-    describe("->apply()", function () {
+    describe("->apply()", function() {
 
 
-        it("applies middlewares", function () {
+        it("applies middlewares", function() {
 
 
             $r = new Router();
-            $route = $r->bind('foo/bar', function ($route) {
+            $route = $r->bind('foo/bar', function($route) {
 
                 return 'A';
-            })->apply(function ($request, $response, $next) {
+            })->apply(function($request, $response, $next) {
 
-                return '1' . $next() . '1';
-            })->apply(function ($request, $response, $next) {
+                return '1'.$next().'1';
+            })->apply(function($request, $response, $next) {
 
-                return '2' . $next() . '2';
+                return '2'.$next().'2';
             });
             $route = $r->route('foo/bar');
             $actual = $route->dispatch();
             expect($actual)->toBe('21A12');
         });
     });
-    describe("->link()", function () {
+    describe("->link()", function() {
 
 
-        it("creates relative links", function () {
+        it("creates relative links", function() {
 
 
             $route = new Route(['pattern' => '/foo/{bar}']);
             $link = $route->link(['bar' => 'baz']);
             expect($link)->toBe('/foo/baz');
         });
-        it("supports optionnal parameters", function () {
+        it("supports optionnal parameters", function() {
 
 
             $route = new Route(['pattern' => '/foo[/{bar}]']);
@@ -143,7 +143,7 @@ 
             $link = $route->link(['bar' => 'baz']);
             expect($link)->toBe('/foo/baz');
         });
-        it("supports multiple optionnal parameters", function () {
+        it("supports multiple optionnal parameters", function() {
 
 
             $route = new Route(['pattern' => '/file[/{paths}]*']);
@@ -152,14 +152,14 @@ 
             $link = $route->link(['paths' => ['some', 'file', 'path']]);
             expect($link)->toBe('/file/some/file/path');
         });
-        it("merges default params", function () {
+        it("merges default params", function() {
 
 
             $route = new Route(['pattern' => '/foo/{bar}', 'params' => ['bar' => 'baz']]);
             $link = $route->link();
             expect($link)->toBe('/foo/baz');
         });
-        it("creates absolute links with custom base path", function () {
+        it("creates absolute links with custom base path", function() {
 
 
             $route = new Route([
@@ -176,7 +176,7 @@ 
             ]);
             expect($link)->toBe('https://www.example.com/app/foo/baz');
         });
-        it("allows host and scheme overriding", function () {
+        it("allows host and scheme overriding", function() {
 
 
             $route = new Route([
@@ -195,7 +195,7 @@ 
             ]);
             expect($link)->toBe('http://www.overrided.com/app/foo/baz');
         });
-        it("supports repeatable parameter placeholders as an array", function () {
+        it("supports repeatable parameter placeholders as an array", function() {
 
 
             $route = new Route(['pattern' => 'post[/{id}]*']);
@@ -207,7 +207,7 @@ 
             expect($route->link(['id' => ['123']]))->toBe('/post/123');
             expect($route->link(['id' => ['123', '456', '789']]))->toBe('/post/123/456/789');
         });
-        it("supports route with multiple optional segments", function () {
+        it("supports route with multiple optional segments", function() {
 
 
             $route = new Route(['pattern' => '[{relation}/{rid:[^/:][^/]*}/]post[/{id:[^/:][^/]*}][/:{action}]']);
@@ -222,7 +222,7 @@ 
             $link = $route->link(['relation' => 'user', 'rid' => 5, 'action' => 'edit', 'id' => 12]);
             expect($link)->toBe('/user/5/post/12/:edit');
         });
-        it("supports route with complex repeatable optional segments", function () {
+        it("supports route with complex repeatable optional segments", function() {
 
 
             $route = new Route(['pattern' => '[{relations:[^/]+/[^/:][^/]*}/]*post[/{id:[^/:][^/]*}][/:{action}]']);
@@ -237,40 +237,40 @@ 
             $link = $route->link(['relations' => [['user', 5]], 'action' => 'edit', 'id' => 12]);
             expect($link)->toBe('/user/5/post/12/:edit');
         });
-        it("throws an exception for missing variables", function () {
+        it("throws an exception for missing variables", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 $route = new Route(['pattern' => 'post[/{id}]+']);
                 echo $route->link([]);
             };
             expect($closure)->toThrow(new RouterException("Missing parameters `'id'` for route: `'#/post[/{id}]+'`."));
         });
-        it("throws an exception when a variable doesn't match its capture pattern", function () {
+        it("throws an exception when a variable doesn't match its capture pattern", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 $route = new Route(['pattern' => 'post/{id:[0-9]{3}}']);
                 $route->link(['id' => '1234']);
             };
             expect($closure)->toThrow(new RouterException("Expected `'id'` to match `'[0-9]{3}'`, but received `'1234'`."));
         });
-        it("throws an exception when a an array is provided for a non repeatable parameter placeholder", function () {
+        it("throws an exception when a an array is provided for a non repeatable parameter placeholder", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 $route = new Route(['pattern' => 'post/{id}']);
                 $route->link(['id' => ['123', '456']]);
             };
             expect($closure)->toThrow(new RouterException("Expected `'id'` to match `'[^/]+'`, but received `'123/456'`."));
         });
-        it("throws an exception when one element of an array doesn't match the capture pattern", function () {
+        it("throws an exception when one element of an array doesn't match the capture pattern", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 $route = new Route(['pattern' => 'post[/{id:[0-9]{3}}]+']);
                 $route->link(['id' => ['123', '456', '78']]);
@@ -278,17 +278,17 @@ 
             expect($closure)->toThrow(new RouterException("Expected `'id'` to match `'[0-9]{3}'`, but received `'78'`."));
         });
     });
-    describe("->dispatch()", function () {
+    describe("->dispatch()", function() {
 
 
-        it("passes route as argument of the handler function", function () {
+        it("passes route as argument of the handler function", function() {
 
 
             $r = new Router();
             $r->get(
                 'foo/{var1}[/{var2}]',
                 ['host' => '{subdomain}.{domain}.bar'],
-                function ($route, $response) {
+                function($route, $response) {
 
                     return array_merge([$response], array_values($route->params));
                 }
@@ -301,13 +301,13 @@ 
             $actual = $route->dispatch($response);
             expect($actual)->toBe([$response, 'foo', 'biz', '25', 'bar']);
         });
-        it("throws an exception on non valid routes", function () {
+        it("throws an exception on non valid routes", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 $r = new Router();
-                $r->get('foo', function () {
+                $r->get('foo', function() {
                 });
                 $route = $r->route('bar');
                 $route->dispatch();

src/Router.php

Spacing +5 added lines, -5 removed lines

@@ -183,7 +183,7 @@ 
     public function setBasePath(string $basePath): self
     {
         $basePath = trim($basePath, '/');
-        $this->basePath = $basePath ? '/' . $basePath : '';
+        $this->basePath = $basePath ? '/'.$basePath : '';
         return $this;
     }
 
@@ -220,7 +220,7 @@ 
             $options['host'] = $this->hosts[$scheme][$host];
         }
 
-        $patternKey = md5($options['pattern'] . '-' . $options['name']);
+        $patternKey = md5($options['pattern'].'-'.$options['name']);
         if (isset($this->pattern[$scheme][$host][$patternKey])) {
             $route = $this->pattern[$scheme][$host][$patternKey];
         } else {
@@ -280,7 +280,7 @@ 
             $options['host'] = $this->hosts[$scheme][$host];
         }
 
-        $patternKey = md5($options['pattern'] . '-' . $options['name']);
+        $patternKey = md5($options['pattern'].'-'.$options['name']);
         if (isset($this->pattern[$scheme][$host][$patternKey])) {
             $instance = $this->pattern[$scheme][$host][$patternKey];
         } else {
@@ -293,7 +293,7 @@ 
             $this->pattern[$scheme][$host][$patternKey] = $instance;
         }
 
-        $methods = $options['methods'] ? (array)$options['methods'] : [];
+        $methods = $options['methods'] ? (array) $options['methods'] : [];
         $instance->allow($methods);
         foreach ($methods as $method) {
             $this->routes[$scheme][$host][strtoupper($method)][] = $instance;
@@ -411,7 +411,7 @@ 
             $request = $parsed + $request;
         }
 
-        $request['path'] = (ltrim((string)strtok($request['path'], '?'), '/'));
+        $request['path'] = (ltrim((string) strtok($request['path'], '?'), '/'));
         $request['method'] = strtoupper($request['method']);
 
         return $request;

src/Route.php

Spacing +24 added lines, -24 removed lines

@@ -180,7 +180,7 @@ 
         $this->setMethods($config['methods']);
         $this->setScope($config['scope']);
         $this->setPattern($config['pattern']);
-        $this->setMiddleware((array)$config['middleware']);
+        $this->setMiddleware((array) $config['middleware']);
     }
 
     /**
@@ -191,7 +191,7 @@ 
      */
     public function setMiddleware(array $middleware)
     {
-        $this->middleware = (array)$middleware;
+        $this->middleware = (array) $middleware;
 
         return $this;
     }
@@ -371,7 +371,7 @@ 
     {
         $this->prefix = trim($prefix, '/');
         if ($this->prefix) {
-            $this->prefix = '/' . $this->prefix;
+            $this->prefix = '/'.$this->prefix;
         }
 
         return $this;
@@ -440,7 +440,7 @@ 
      */
     public function setMethods($methods): self
     {
-        $methods = $methods ? (array)$methods : [];
+        $methods = $methods ? (array) $methods : [];
         $methods = array_map('strtoupper', $methods);
         $methods = array_fill_keys($methods, true);
 
@@ -463,7 +463,7 @@ 
      */
     public function allow($methods = [])
     {
-        $methods = $methods ? (array)$methods : [];
+        $methods = $methods ? (array) $methods : [];
         $methods = array_map('strtoupper', $methods);
         $methods = array_fill_keys($methods, true) + $this->methods;
 
@@ -523,10 +523,10 @@ 
         $this->variables = null;
 
         if (!$pattern || $pattern[0] !== '[') {
-            $pattern = '/' . trim($pattern, '/');
+            $pattern = '/'.trim($pattern, '/');
         }
 
-        $this->pattern = $this->prefix . $pattern;
+        $this->pattern = $this->prefix.$pattern;
 
         return $this;
     }
@@ -640,9 +640,9 @@ 
             }
         }
 
-        $path = '/' . trim($path, '/');
+        $path = '/'.trim($path, '/');
 
-        if (!preg_match('~^' . $this->regex() . '$~', $path, $matches)) {
+        if (!preg_match('~^'.$this->regex().'$~', $path, $matches)) {
             return false;
         }
         $variables = $this->_buildVariables($matches);
@@ -674,7 +674,7 @@ 
             } else {
                 $token = $parser::tokenize($pattern, '/');
                 $rule = $parser::compile($token);
-                if (preg_match_all('~' . $rule[0] . '~', $values[$i], $parts)) {
+                if (preg_match_all('~'.$rule[0].'~', $values[$i], $parts)) {
                     foreach ($parts[1] as $value) {
                         if (strpos($value, '/') !== false) {
                             $variables[$name][] = explode('/', $value);
@@ -705,7 +705,7 @@ 
 
         $generator = $this->middleware();
 
-        $next = function () use ($request, $response, $generator, &$next) {
+        $next = function() use ($request, $response, $generator, &$next) {
             $handler = $generator->current();
             $generator->next();
 
@@ -733,7 +733,7 @@ 
             }
         }
 
-        yield function () {
+        yield function() {
             $handler = $this->handler();
             if ($handler === null) {
                 return null;
@@ -781,7 +781,7 @@ 
 
         $options = array_filter(
             $options,
-            function ($value) {
+            function($value) {
                 return $value !== '*';
             }
         );
@@ -793,24 +793,24 @@ 
 
         $basePath = trim($options['basePath'], '/');
         if ($basePath) {
-            $basePath = '/' . $basePath;
+            $basePath = '/'.$basePath;
         }
         $link = isset($link) ? ltrim($link, '/') : '';
-        $link = $basePath . ($link ? '/' . $link : $link);
-        $query = $options['query'] ? '?' . $options['query'] : '';
-        $fragment = $options['fragment'] ? '#' . $options['fragment'] : '';
+        $link = $basePath.($link ? '/'.$link : $link);
+        $query = $options['query'] ? '?'.$options['query'] : '';
+        $fragment = $options['fragment'] ? '#'.$options['fragment'] : '';
 
         if ($options['absolute']) {
             if ($this->host !== null) {
-                $link = $this->host->link($params, $options) . "{$link}";
+                $link = $this->host->link($params, $options)."{$link}";
             } else {
-                $scheme = !empty($options['scheme']) ? $options['scheme'] . '://' : '//';
+                $scheme = !empty($options['scheme']) ? $options['scheme'].'://' : '//';
                 $host = isset($options['host']) ? $options['host'] : 'localhost';
                 $link = "{$scheme}{$host}{$link}";
             }
         }
 
-        return $link . $query . $fragment;
+        return $link.$query.$fragment;
     }
 
     /**
@@ -831,7 +831,7 @@ 
             if (isset($child['tokens'])) {
                 if ($child['repeat']) {
                     $name = $child['repeat'];
-                    $values = isset($params[$name]) && $params[$name] !== null ? (array)$params[$name] : [];
+                    $values = isset($params[$name]) && $params[$name] !== null ? (array) $params[$name] : [];
                     if (!$values && !$child['optional']) {
                         throw new RouterException("Missing parameters `'{$name}'` for route: `'{$this->name}#{$this->pattern}'`.");
                     }
@@ -858,12 +858,12 @@ 
                 $parts = [];
             }
             foreach ($parts as $key => $value) {
-                $parts[$key] = rawurlencode((string)$value);
+                $parts[$key] = rawurlencode((string) $value);
             }
             $value = join('/', $parts);
 
-            if (!preg_match('~^' . $child['pattern'] . '$~', $value)) {
-                throw new RouterException("Expected `'" . $child['name'] . "'` to match `'" . $child['pattern'] . "'`, but received `'" . $value . "'`.");
+            if (!preg_match('~^'.$child['pattern'].'$~', $value)) {
+                throw new RouterException("Expected `'".$child['name']."'` to match `'".$child['pattern']."'`, but received `'".$value."'`.");
             }
             $link .= $value;
         }

spec/Suite/Router.spec.php

Spacing +161 added lines, -161 removed lines

@@ -12,32 +12,32 @@ 
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
 
-describe("Router", function () {
+describe("Router", function() {
 
 
-    beforeEach(function () {
+    beforeEach(function() {
 
 
         $this->router = new Router();
-        $this->export = function ($request) {
+        $this->export = function($request) {
 
             return array_intersect_key($request, array_fill_keys(['path', 'method', 'host', 'scheme'], true));
         };
     });
-    describe("->__construct()", function () {
+    describe("->__construct()", function() {
 
 
-        it("formats the basePath", function () {
+        it("formats the basePath", function() {
 
 
             $router = new Router(['basePath' => '/']);
             expect($router->basePath())->toBe('');
         });
     });
-    describe("->basePath()", function () {
+    describe("->basePath()", function() {
 
 
-        it("sets an empty basePath", function () {
+        it("sets an empty basePath", function() {
 
 
             expect($this->router->setBasePath('/'))->toBe($this->router);
@@ -45,7 +45,7 @@ 
             expect($this->router->setBasePath(''))->toBe($this->router);
             expect($this->router->basePath())->toBe('');
         });
-        it("adds an leading slash for non empty basePath", function () {
+        it("adds an leading slash for non empty basePath", function() {
 
 
             expect($this->router->setBasePath('app'))->toBe($this->router);
@@ -54,24 +54,24 @@ 
             expect($this->router->basePath())->toBe('/base');
         });
     });
-    describe("->bind()", function () {
+    describe("->bind()", function() {
 
 
-        it("binds a named route", function () {
+        it("binds a named route", function() {
 
 
             $r = $this->router;
-            $route = $r->bind('foo/bar', ['name' => 'foo'], function () {
+            $route = $r->bind('foo/bar', ['name' => 'foo'], function() {
                 return 'hello';
             });
             expect(isset($r['foo']))->toBe(true);
             expect($r['foo'])->toBe($route);
         });
-        it("matches on methods", function () {
+        it("matches on methods", function() {
 
 
             $r = $this->router;
-            $r->bind('foo/bar', ['methods' => ['POST', 'PUT']], function () {
+            $r->bind('foo/bar', ['methods' => ['POST', 'PUT']], function() {
             });
             $route = $r->route('foo/bar', 'POST');
             expect($route->Methods())->toBe(['POST', 'PUT']);
@@ -83,11 +83,11 @@ 
                 expect($e->getMessage())->toBe("No route found for `*:*:GET:/bar/foo`.");
             }
         });
-        it("supports lowercase method names", function () {
+        it("supports lowercase method names", function() {
 
 
             $r = $this->router;
-            $r->bind('foo/bar', ['methods' => ['POST', 'PUT']], function () {
+            $r->bind('foo/bar', ['methods' => ['POST', 'PUT']], function() {
             });
             $route = $r->route('foo/bar', 'post');
             expect($route->Methods())->toBe(['POST', 'PUT']);
@@ -99,42 +99,42 @@ 
                 expect($e->getMessage())->toBe("No route found for `*:*:GET:/bar/foo`.");
             }
         });
-        it("matches on same path different methods", function () {
+        it("matches on same path different methods", function() {
 
             $r = $this->router;
-            $r->bind('foo/bar', ['name' => 'foo', 'methods' => ['POST']], function () {
+            $r->bind('foo/bar', ['name' => 'foo', 'methods' => ['POST']], function() {
             });
-            $r->bind('foo/bar', ['name' => 'bar', 'methods' => ['PUT']], function () {
+            $r->bind('foo/bar', ['name' => 'bar', 'methods' => ['PUT']], function() {
             });
             $route = $r->route('foo/bar', 'POST');
             expect($route->name)->toBe('foo');
             $route = $r->route('foo/bar', 'PUT');
             expect($route->name)->toBe('bar');
         });
-        it("throws an exception when trying to use the `'method'` option", function () {
+        it("throws an exception when trying to use the `'method'` option", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 $r = $this->router;
-                $r->bind('foo', ['method' => 'GET'], function () {
+                $r->bind('foo', ['method' => 'GET'], function() {
                 });
             };
             expect($closure)->toThrow(new RouterException("Use the `'methods'` option to limit HTTP verbs on a route binding definition."));
         });
     });
-    describe("->link()", function () {
+    describe("->link()", function() {
 
 
-        it("forwards router base path", function () {
+        it("forwards router base path", function() {
 
 
             $r = $this->router;
             $r->basePath('app');
 
-            $r->group(['host' => 'www.{domain}.com', 'scheme' => 'https'], function ($r) {
+            $r->group(['host' => 'www.{domain}.com', 'scheme' => 'https'], function($r) {
 
-                $r->bind('foo/{bar}', ['name' => 'foo'], function () {
+                $r->bind('foo/{bar}', ['name' => 'foo'], function() {
                 });
             });
             $link = $r->link('foo', [
@@ -143,28 +143,28 @@ 
             ], ['absolute' => true]);
             expect($link)->toBe('https://www.example.com/app/foo/baz');
         });
-        it("maintains prefixes in nested routes", function () {
+        it("maintains prefixes in nested routes", function() {
 
 
             $r = $this->router;
-            $r->group('foo', ['name' => 'foz'], function ($r) {
+            $r->group('foo', ['name' => 'foz'], function($r) {
 
-                $r->group('bar', ['name' => 'baz'], function ($r) {
+                $r->group('bar', ['name' => 'baz'], function($r) {
 
-                    $r->bind('{var1}', ['name' => 'quz'], function () {
+                    $r->bind('{var1}', ['name' => 'quz'], function() {
                     });
                 });
             });
             $link = $r->link('foz.baz.quz', ['var1' => 'hello']);
             expect($link)->toBe('/foo/bar/hello');
         });
-        it("persists persisted parameters in a dispatching context", function () {
+        it("persists persisted parameters in a dispatching context", function() {
 
 
             $r = $this->router;
-            $r->group('{locale:en|fr}', ['persist' => 'locale'], function ($r) {
+            $r->group('{locale:en|fr}', ['persist' => 'locale'], function($r) {
 
-                $r->bind('{controller}/{action}[/{id}]', ['name' => 'controller'], function () {
+                $r->bind('{controller}/{action}[/{id}]', ['name' => 'controller'], function() {
                 });
             });
             $r->route('fr/post/index');
@@ -182,13 +182,13 @@ 
             ]);
             expect($link)->toBe('/en/post/view/5');
         });
-        it("overrides persisted parameters in a dispatching context", function () {
+        it("overrides persisted parameters in a dispatching context", function() {
 
 
             $r = $this->router;
-            $r->group('{locale:en|fr}', ['persist' => 'locale'], function ($r) {
+            $r->group('{locale:en|fr}', ['persist' => 'locale'], function($r) {
 
-                $r->bind('{controller}/{action}[/{id}]', ['name' => 'controller'], function () {
+                $r->bind('{controller}/{action}[/{id}]', ['name' => 'controller'], function() {
                 });
             });
             $r->route('fr/post/index');
@@ -200,24 +200,24 @@ 
             ]);
             expect($link)->toBe('/en/post/view/5');
         });
-        it("throws an exception when no route is found for a specified name", function () {
+        it("throws an exception when no route is found for a specified name", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 $this->router->link('not.binded.yet', []);
             };
             expect($closure)->toThrow(new RouterException("No route defined for `'not.binded.yet'`, bind it first with `bind()`."));
         });
     });
-    describe("->route()", function () {
+    describe("->route()", function() {
 
 
-        it("routes on a simple route", function () {
+        it("routes on a simple route", function() {
 
 
             $r = $this->router;
-            $r->bind('foo/bar', function () {
+            $r->bind('foo/bar', function() {
             });
             $route = $r->route('foo/bar', 'GET');
             expect($this->export($route->request))->toEqual([
@@ -232,11 +232,11 @@ 
                 expect($e->getMessage())->toBe("No route found for `*:*:GET:/bar/foo`.");
             }
         });
-        it("routes on a named route", function () {
+        it("routes on a named route", function() {
 
 
             $r = $this->router;
-            $r->bind('foo/bar', ['name' => 'foo'], function () {
+            $r->bind('foo/bar', ['name' => 'foo'], function() {
             });
             $route = $r->route('foo/bar', 'GET');
             expect($route->name)->toBe('foo');
@@ -246,11 +246,11 @@ 
                 expect($e->getMessage())->toBe("No route found for `*:*:GET:/bar/foo`.");
             }
         });
-        it("supports empty as index route", function () {
+        it("supports empty as index route", function() {
 
 
             $r = $this->router;
-            $r->bind('', function () {
+            $r->bind('', function() {
             });
             $route = $r->route('', 'GET');
             expect($this->export($route->request))->toEqual([
@@ -260,11 +260,11 @@ 
                 'path'   => ''
             ]);
         });
-        it("supports a slash as indes route", function () {
+        it("supports a slash as indes route", function() {
 
 
             $r = $this->router;
-            $r->bind('/', function () {
+            $r->bind('/', function() {
             });
             $route = $r->route('', 'GET');
             expect($this->export($route->request))->toEqual([
@@ -274,11 +274,11 @@ 
                 'path'   => ''
             ]);
         });
-        it("supports route variables", function () {
+        it("supports route variables", function() {
 
 
             $r = $this->router;
-            $r->get('foo/{param}', function () {
+            $r->get('foo/{param}', function() {
             });
             $route = $r->route('foo/bar', 'GET');
             expect($route->params)->toBe(['param' => 'bar']);
@@ -288,11 +288,11 @@ 
                 expect($e->getMessage())->toBe("No route found for `*:*:GET:/bar/foo`.");
             }
         });
-        it("supports constrained route variables", function () {
+        it("supports constrained route variables", function() {
 
 
             $r = $this->router;
-            $r->get('foo/{var1:\d+}', function () {
+            $r->get('foo/{var1:\d+}', function() {
             });
             $route = $r->route('foo/25', 'GET');
             expect($route->params)->toBe(['var1' => '25']);
@@ -302,22 +302,22 @@ 
                 expect($e->getMessage())->toBe("No route found for `*:*:GET:/foo/bar`.");
             }
         });
-        it("supports optional segments with variables", function () {
+        it("supports optional segments with variables", function() {
 
 
             $r = $this->router;
-            $r->get('foo[/{var1}]', function () {
+            $r->get('foo[/{var1}]', function() {
             });
             $route = $r->route('foo', 'GET');
             expect($route->params)->toBe(['var1' => null]);
             $route = $r->route('foo/bar', 'GET');
             expect($route->params)->toBe(['var1' => 'bar']);
         });
-        it("supports repeatable segments", function () {
+        it("supports repeatable segments", function() {
 
 
             $r = $this->router;
-            $r->get('foo[/:{var1}]*[/bar[/:{var2}]*]', function () {
+            $r->get('foo[/:{var1}]*[/bar[/:{var2}]*]', function() {
             });
             $route = $r->route('foo', 'GET');
             expect($route->params)->toBe([
@@ -335,11 +335,11 @@ 
                 'var2' => ['fuz']
             ]);
         });
-        it("supports optional segments with custom variable regex", function () {
+        it("supports optional segments with custom variable regex", function() {
 
 
             $r = $this->router;
-            $r->get('foo[/{var1:\d+}]', function () {
+            $r->get('foo[/{var1:\d+}]', function() {
             });
             $route = $r->route('foo', 'GET');
             expect($route->params)->toBe(['var1' => null]);
@@ -351,7 +351,7 @@ 
                 expect($e->getMessage())->toBe("No route found for `*:*:GET:/foo/baz`.");
             }
         });
-        it("supports multiple optional segments", function () {
+        it("supports multiple optional segments", function() {
 
 
             $patterns = [
@@ -360,7 +360,7 @@ 
             $r = $this->router;
 
             foreach ($patterns as $pattern) {
-                $r->get($pattern, function () {
+                $r->get($pattern, function() {
                 });
                 $route = $r->route('foo', 'GET');
                 expect($route->params)->toBe(['var1' => 'foo', 'var2' => null]);
@@ -369,13 +369,13 @@ 
                 $r->clear();
             };
         });
-        it("supports host variables", function () {
+        it("supports host variables", function() {
 
 
             $r = $this->router;
-            $r->get('foo/{var1:\d+}', ['host' => 'foo.{domain}.bar'], function () {
+            $r->get('foo/{var1:\d+}', ['host' => 'foo.{domain}.bar'], function() {
             });
-            $r->get('foo/{var1:\d+}', ['host' => 'foo.{domain}.baz'], function () {
+            $r->get('foo/{var1:\d+}', ['host' => 'foo.{domain}.baz'], function() {
             });
             $route = $r->route('foo/25', 'GET', 'foo.biz.bar');
             expect($route->Host()->pattern())->toBe('foo.{domain}.bar');
@@ -384,27 +384,27 @@ 
             expect($route->Host()->pattern())->toBe('foo.{domain}.baz');
             expect($route->params)->toBe(['domain' => 'buz', 'var1' => '50']);
         });
-        it("supports constrained host variables", function () {
+        it("supports constrained host variables", function() {
 
 
             $r = $this->router;
-            $r->get('foo/{var1:\d+}', ['host' => '{subdomain:foo}.{domain}.bar'], function () {
+            $r->get('foo/{var1:\d+}', ['host' => '{subdomain:foo}.{domain}.bar'], function() {
             });
             $route = $r->route('foo/25', 'GET', 'foo.biz.bar');
-            expect($route->params)->toBe([ 'subdomain' => 'foo', 'domain' => 'biz', 'var1' => '25']);
+            expect($route->params)->toBe(['subdomain' => 'foo', 'domain' => 'biz', 'var1' => '25']);
             try {
                 $route = $r->route('foo/bar', 'GET', 'foo.biz.bar');
             } catch (RouteNotFoundException $e) {
                 expect($e->getMessage())->toBe("No route found for `*:foo.biz.bar:GET:/foo/bar`.");
             }
         });
-        it("supports absolute URL", function () {
+        it("supports absolute URL", function() {
 
 
             $r = $this->router;
-            $r->get('foo/{var1:\d+}', ['host' => 'foo.{domain}.bar'], function () {
+            $r->get('foo/{var1:\d+}', ['host' => 'foo.{domain}.bar'], function() {
             });
-            $r->get('foo/{var1:\d+}', ['host' => 'foo.{domain}.baz'], function () {
+            $r->get('foo/{var1:\d+}', ['host' => 'foo.{domain}.baz'], function() {
             });
             $route = $r->route('http://foo.biz.bar/foo/25', 'GET');
             expect($route->Host()->pattern())->toBe('foo.{domain}.bar');
@@ -413,23 +413,23 @@ 
             expect($route->Host()->pattern())->toBe('foo.{domain}.baz');
             expect($route->params)->toBe(['domain' => 'buz', 'var1' => '50']);
         });
-        it("supports RESTful routes", function () {
+        it("supports RESTful routes", function() {
 
 
             $r = $this->router;
-            $r->get('foo/bar', function () {
+            $r->get('foo/bar', function() {
             });
-            $r->head('foo/bar', function () {
+            $r->head('foo/bar', function() {
             });
-            $r->post('foo/bar', function () {
+            $r->post('foo/bar', function() {
             });
-            $r->put('foo/bar', function () {
+            $r->put('foo/bar', function() {
             });
-            $r->patch('foo/bar', function () {
+            $r->patch('foo/bar', function() {
             });
-            $r->delete('foo/bar', function () {
+            $r->delete('foo/bar', function() {
             });
-            $r->options('foo/bar', function () {
+            $r->options('foo/bar', function() {
             });
             $methods = ['OPTIONS', 'DELETE', 'PATCH', 'PUT', 'POST', 'HEAD', 'GET'];
             $route = $r->route('foo/bar', 'GET');
@@ -447,11 +447,11 @@ 
             $route = $r->route('foo/bar', 'OPTIONS');
             expect($route->Methods())->toBe($methods);
         });
-        it("matches relationships based routes", function () {
+        it("matches relationships based routes", function() {
 
 
             $r = $this->router;
-            $r->get('[/{relations:[^/]+/[^/:][^/]*}]*/comment[/{id:[^/:][^/]*}][/:{action}]', function () {
+            $r->get('[/{relations:[^/]+/[^/:][^/]*}]*/comment[/{id:[^/:][^/]*}][/:{action}]', function() {
             });
             $route = $r->route('blog/1/post/22/comment/:show', 'GET');
             expect($route->params)->toBe([
@@ -463,35 +463,35 @@ 
                 'action' => 'show'
             ]);
         });
-        it("dispatches HEAD requests on matching GET routes if the HEAD routes are missing", function () {
+        it("dispatches HEAD requests on matching GET routes if the HEAD routes are missing", function() {
 
 
             $r = $this->router;
-            $r->get('foo/bar', function () {
+            $r->get('foo/bar', function() {
                 return 'GET';
             });
             $route = $r->route('foo/bar', 'HEAD');
             expect($route->Methods())->toBe(['GET']);
         });
-        it("dispatches HEAD requests on matching HEAD routes", function () {
+        it("dispatches HEAD requests on matching HEAD routes", function() {
 
 
             $r = $this->router;
 
-            $r->head('foo/bar', function () {
+            $r->head('foo/bar', function() {
                 return 'HEAD';
             });
-            $r->get('foo/bar', function () {
+            $r->get('foo/bar', function() {
                 return 'GET';
             });
             $route = $r->route('foo/bar', 'HEAD');
             expect($route->Methods())->toBe(['GET', 'HEAD']);
         });
-        it("supports requests as a list of arguments", function () {
+        it("supports requests as a list of arguments", function() {
 
 
             $r = $this->router;
-            $r->bind('foo/bar', function () {
+            $r->bind('foo/bar', function() {
             });
             $route = $r->route('foo/bar', 'GET');
             expect($this->export($route->request))->toEqual([
@@ -501,10 +501,10 @@ 
                 'path'   => 'foo/bar'
             ]);
         });
-        it("supports requests as an object", function () {
+        it("supports requests as an object", function() {
 
             $r = $this->router;
-            $r->bind('foo/bar', function () {
+            $r->bind('foo/bar', function() {
             });
             $request = Double::instance(['implements' => ServerRequestInterface::class]);
             $uri = Double::instance(['implements' => UriInterface::class]);
@@ -517,11 +517,11 @@ 
             $route = $r->route($request, 'GET');
             expect($route->request)->toBe($request);
         });
-        it("supports requests as an array", function () {
+        it("supports requests as an array", function() {
 
 
             $r = $this->router;
-            $r->bind('foo/bar', function () {
+            $r->bind('foo/bar', function() {
             });
             $route = $r->route(['path' => 'foo/bar'], 'GET');
             expect($this->export($route->request))->toEqual([
@@ -532,59 +532,59 @@ 
             ]);
         });
     });
-    describe("->group()", function () {
+    describe("->group()", function() {
 
 
-        it("supports nested named route", function () {
+        it("supports nested named route", function() {
 
 
             $r = $this->router;
-            $r->group('foo', ['name' => 'foz'], function ($r) use (&$route) {
+            $r->group('foo', ['name' => 'foz'], function($r) use (&$route) {
 
-                $r->group('bar', ['name' => 'baz'], function ($r) use (&$route) {
+                $r->group('bar', ['name' => 'baz'], function($r) use (&$route) {
 
-                    $route = $r->bind('{var1}', ['name' => 'quz'], function () {
+                    $route = $r->bind('{var1}', ['name' => 'quz'], function() {
                     });
                 });
             });
             expect(isset($r['foz.baz.quz']))->toBe(true);
             expect($r['foz.baz.quz'])->toBe($route);
         });
-        it("returns a working scope", function () {
+        it("returns a working scope", function() {
 
 
             $r = $this->router;
-            $route = $r->group('foo', ['name' => 'foz'], function () {
-            })->group('bar', ['name' => 'baz'], function () {
-            })->bind('{var1}', ['name' => 'quz'], function () {
+            $route = $r->group('foo', ['name' => 'foz'], function() {
+            })->group('bar', ['name' => 'baz'], function() {
+            })->bind('{var1}', ['name' => 'quz'], function() {
             });
             expect(isset($r['foz.baz.quz']))->toBe(true);
             expect($r['foz.baz.quz'])->toBe($route);
         });
-        context("with a prefix contraint", function () {
+        context("with a prefix contraint", function() {
 
 
-            beforeEach(function () {
+            beforeEach(function() {
 
 
                 $r = $this->router;
-                $r->group('foo', function ($r) {
+                $r->group('foo', function($r) {
 
-                    $r->bind('{var1}', function () {
+                    $r->bind('{var1}', function() {
                     });
                 });
             });
-            it("respects url's prefix constraint", function () {
+            it("respects url's prefix constraint", function() {
 
 
                 $r = $this->router;
                 $route = $r->route('foo/bar');
                 expect($route->params)->toBe(['var1'   => 'bar']);
             });
-            it("throws an exception when the prefix does not match", function () {
+            it("throws an exception when the prefix does not match", function() {
 
 
-                $closure = function () {
+                $closure = function() {
 
                     $r = $this->router;
                     $route = $r->route('bar/foo', 'GET');
@@ -592,30 +592,30 @@ 
                 expect($closure)->toThrow(new RouteNotFoundException("No route found for `*:*:GET:/bar/foo`."));
             });
         });
-        context("with a prefix contraint and an optional parameter", function () {
+        context("with a prefix contraint and an optional parameter", function() {
 
 
-            beforeEach(function () {
+            beforeEach(function() {
 
 
                 $r = $this->router;
-                $r->group('foo', function ($r) {
+                $r->group('foo', function($r) {
 
-                    $r->bind('[{var1}]', function () {
+                    $r->bind('[{var1}]', function() {
                     });
                 });
             });
-            it("respects url's prefix constraint", function () {
+            it("respects url's prefix constraint", function() {
 
 
                 $r = $this->router;
                 $route = $r->route('foo');
                 expect($route->params)->toBe(['var1' => null]);
             });
-            it("throws an exception when the prefix does not match", function () {
+            it("throws an exception when the prefix does not match", function() {
 
 
-                $closure = function () {
+                $closure = function() {
 
                     $r = $this->router;
                     $route = $r->route('bar/foo', 'GET');
@@ -623,23 +623,23 @@ 
                 expect($closure)->toThrow(new RouteNotFoundException("No route found for `*:*:GET:/bar/foo`."));
             });
         });
-        context("with a host constraint", function () {
+        context("with a host constraint", function() {
 
 
-            beforeEach(function () {
+            beforeEach(function() {
 
 
                 $r = $this->router;
-                $r->group('foo', ['host' => 'foo.{domain}.bar'], function ($r) {
+                $r->group('foo', ['host' => 'foo.{domain}.bar'], function($r) {
 
-                    $r->group('bar', function ($r) {
+                    $r->group('bar', function($r) {
 
-                        $r->bind('{var1}', function () {
+                        $r->bind('{var1}', function() {
                         });
                     });
                 });
             });
-            it("respects url's host constraint", function () {
+            it("respects url's host constraint", function() {
 
 
                 $r = $this->router;
@@ -649,10 +649,10 @@ 
                     'var1'   => 'baz'
                 ]);
             });
-            it("throws an exception when the host does not match", function () {
+            it("throws an exception when the host does not match", function() {
 
 
-                $closure = function () {
+                $closure = function() {
 
                     $r = $this->router;
                     $route = $r->route('http://bar.hello.foo/foo/bar/baz', 'GET');
@@ -660,23 +660,23 @@ 
                 expect($closure)->toThrow(new RouteNotFoundException("No route found for `http:bar.hello.foo:GET:/foo/bar/baz`."));
             });
         });
-        context("with a scheme constraint", function () {
+        context("with a scheme constraint", function() {
 
 
-            beforeEach(function () {
+            beforeEach(function() {
 
 
                 $r = $this->router;
-                $r->group('foo', ['scheme' => 'http'], function ($r) {
+                $r->group('foo', ['scheme' => 'http'], function($r) {
 
-                    $r->group('bar', function ($r) {
+                    $r->group('bar', function($r) {
 
-                        $r->bind('{var1}', function () {
+                        $r->bind('{var1}', function() {
                         });
                     });
                 });
             });
-            it("respects url's scheme constraint", function () {
+            it("respects url's scheme constraint", function() {
 
 
                 $r = $this->router;
@@ -685,10 +685,10 @@ 
                     'var1'   => 'baz'
                 ]);
             });
-            it("throws an exception when route is not found", function () {
+            it("throws an exception when route is not found", function() {
 
 
-                $closure = function () {
+                $closure = function() {
 
                     $r = $this->router;
                     $route = $r->route('https://domain.com/foo/bar/baz', 'GET');
@@ -696,25 +696,25 @@ 
                 expect($closure)->toThrow(new RouteNotFoundException("No route found for `https:domain.com:GET:/foo/bar/baz`."));
             });
         });
-        it("concats namespace values", function () {
+        it("concats namespace values", function() {
 
 
             $r = $this->router;
-            $r->group('foo', ['namespace' => 'My'], function ($r) {
+            $r->group('foo', ['namespace' => 'My'], function($r) {
 
-                $r->group('bar', ['namespace' => 'Name'], function ($r) {
+                $r->group('bar', ['namespace' => 'Name'], function($r) {
 
-                    $r->bind('{var1}', ['namespace' => 'Space'], function () {
+                    $r->bind('{var1}', ['namespace' => 'Space'], function() {
                     });
                 });
             });
             $route = $r->route('foo/bar/baz', 'GET');
             expect($route->namespace)->toBe('My\Name\Space\\');
         });
-        it("throws an exception when the handler is not a closure", function () {
+        it("throws an exception when the handler is not a closure", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 $r = $this->router;
                 $r->group('foo', 'substr');
@@ -722,24 +722,24 @@ 
             expect($closure)->toThrow(new RouterException("The handler needs to be an instance of `Closure` or implements the `__invoke()` magic method."));
         });
     });
-    describe("->middleware()", function () {
+    describe("->middleware()", function() {
 
 
-        it("returns global middleware", function () {
+        it("returns global middleware", function() {
 
 
             $r = $this->router;
-            $mw1 = function ($request, $response, $next) {
+            $mw1 = function($request, $response, $next) {
 
-                return '1' . $next() . '1';
+                return '1'.$next().'1';
             };
-            $mw2 = function ($request, $response, $next) {
+            $mw2 = function($request, $response, $next) {
 
-                return '2' . $next() . '2';
+                return '2'.$next().'2';
             };
             $r->apply($mw1, $mw2);
 
-            $next = function () {
+            $next = function() {
                 return '';
             };
             $generator = $r->middleware();
@@ -750,21 +750,21 @@ 
             expect($actual1(null, null, $next))->toBe('11');
         });
     });
-    describe("->apply()", function () {
+    describe("->apply()", function() {
 
 
-        it("applies middlewares globally", function () {
+        it("applies middlewares globally", function() {
 
 
             $r = $this->router;
-            $r->apply(function ($request, $response, $next) {
+            $r->apply(function($request, $response, $next) {
 
-                return '1' . $next() . '1';
-            })->apply(function ($request, $response, $next) {
+                return '1'.$next().'1';
+            })->apply(function($request, $response, $next) {
 
-                return '2' . $next() . '2';
+                return '2'.$next().'2';
             });
-            $route = $r->bind('/foo/bar', function ($route) {
+            $route = $r->bind('/foo/bar', function($route) {
 
                 return 'A';
             });
@@ -772,27 +772,27 @@ 
             $actual = $route->dispatch();
             expect($actual)->toBe('21A12');
         });
-        it("applies middlewares globally and per groups", function () {
+        it("applies middlewares globally and per groups", function() {
 
 
             $r = $this->router;
-            $r->apply(function ($request, $response, $next) {
+            $r->apply(function($request, $response, $next) {
 
-                return '1' . $next() . '1';
+                return '1'.$next().'1';
             });
-            $r->bind('foo/{foo}', ['name' => 'foo'], function () {
+            $r->bind('foo/{foo}', ['name' => 'foo'], function() {
 
                 return 'A';
             });
-            $r->group('bar', function ($r) {
+            $r->group('bar', function($r) {
 
-                $r->bind('{bar}', ['name' => 'bar'], function () {
+                $r->bind('{bar}', ['name' => 'bar'], function() {
 
                     return 'A';
                 });
-            })->apply(function ($request, $response, $next) {
+            })->apply(function($request, $response, $next) {
 
-                return '2' . $next() . '2';
+                return '2'.$next().'2';
             });
             $route = $r->route('foo/foo');
             $actual = $route->dispatch();
@@ -802,15 +802,15 @@ 
             expect($actual)->toBe('21A12');
         });
     });
-    describe("->strategy()", function () {
+    describe("->strategy()", function() {
 
 
-        it("sets a strategy", function () {
+        it("sets a strategy", function() {
 
             $r = $this->router;
-            $mystrategy = function ($router) {
+            $mystrategy = function($router) {
 
-                $router->bind('foo/bar', function () {
+                $router->bind('foo/bar', function() {
 
                     return 'Hello World!';
                 });
@@ -821,11 +821,11 @@ 
             $route = $r->route('foo/bar');
             expect($route->Pattern())->toBe('/foo/bar');
         });
-        it("unsets a strategy", function () {
+        it("unsets a strategy", function() {
 
             $r = $this->router;
 
-            $mystrategy = function () {
+            $mystrategy = function() {
             };
             $r->setStrategy('mystrategy', $mystrategy);
             expect($r->strategy('mystrategy'))->toBe($mystrategy);

spec/Suite/Host.spec.php

Spacing +20 added lines, -20 removed lines

@@ -7,13 +7,13 @@ 
 use Lead\Router\Exception\RouterException;
 use Lead\Router\Host;
 
-describe("Host", function () {
+describe("Host", function() {
 
 
-    describe("->scheme()", function () {
+    describe("->scheme()", function() {
 
 
-        it("gets/sets the scheme", function () {
+        it("gets/sets the scheme", function() {
 
 
             $host = new Host();
@@ -22,10 +22,10 @@ 
             expect($host->scheme())->toBe('https');
         });
     });
-    describe("->pattern()", function () {
+    describe("->pattern()", function() {
 
 
-        it("gets/sets the pattern", function () {
+        it("gets/sets the pattern", function() {
 
 
             $host = new Host();
@@ -37,7 +37,7 @@ 
                 'domain'    => false
             ]);
         });
-        it("updates the regex", function () {
+        it("updates the regex", function() {
 
 
             $host = new Host();
@@ -46,7 +46,7 @@ 
             expect($host->setPattern('foo.{domain}.baz'))->toBe($host);
             expect($host->regex())->toBe('foo\\.([^.]+)\\.baz');
         });
-        it("updates the variables", function () {
+        it("updates the variables", function() {
 
 
             $host = new Host();
@@ -60,10 +60,10 @@ 
             ]);
         });
     });
-    describe("->match()", function () {
+    describe("->match()", function() {
 
 
-        it("returns `true` when host & scheme matches", function () {
+        it("returns `true` when host & scheme matches", function() {
 
 
             $host = new Host(['pattern' => 'foo.{domain}.bar', 'scheme' => 'https']);
@@ -72,7 +72,7 @@ 
             expect($host->match(['scheme' => 'https', 'host' => 'biz.bar.baz'], $variables))->toBe(false);
             expect($host->match(['scheme' => 'http', 'host' => 'foo.baz.bar'], $variables))->toBe(false);
         });
-        it("returns `true` when host matches with a wildcard as host's scheme", function () {
+        it("returns `true` when host matches with a wildcard as host's scheme", function() {
 
 
             $host = new Host(['pattern' => 'foo.{domain}.bar', 'scheme' => 'https']);
@@ -80,7 +80,7 @@ 
             expect($variables)->toBe(['domain' => 'baz']);
             expect($host->match(['scheme' => '*', 'host' => 'biz.baz.bar'], $variables))->toBe(false);
         });
-        it("returns `true` when host matches with a wildcard as request's scheme", function () {
+        it("returns `true` when host matches with a wildcard as request's scheme", function() {
 
 
             $host = new Host(['pattern' => 'foo.{domain}.bar', 'scheme' => '*']);
@@ -88,7 +88,7 @@ 
             expect($variables)->toBe(['domain' => 'baz']);
             expect($host->match(['scheme' => 'https', 'host' => 'biz.baz.bar'], $variables))->toBe(false);
         });
-        it("returns `true` when scheme matches with a wildcard as host's pattern", function () {
+        it("returns `true` when scheme matches with a wildcard as host's pattern", function() {
 
 
             $host = new Host(['pattern' => '*', 'scheme' => 'http']);
@@ -96,7 +96,7 @@ 
             expect($variables)->toBe([]);
             expect($host->match(['scheme' => 'https', 'host' => 'foo.baz.bar'], $variables))->toBe(false);
         });
-        it("returns `true` when scheme matches with a wildcard as request's pattern", function () {
+        it("returns `true` when scheme matches with a wildcard as request's pattern", function() {
 
 
             $host = new Host(['pattern' => 'foo.{domain}.bar', 'scheme' => 'http']);
@@ -105,24 +105,24 @@ 
             expect($host->match(['scheme' => 'https', 'host' => '*'], $variables))->toBe(false);
         });
     });
-    describe("->link()", function () {
+    describe("->link()", function() {
 
 
-        it("builds an host link", function () {
+        it("builds an host link", function() {
 
 
             $host = new Host(['pattern' => 'www.{domain}.com', 'scheme' => 'https']);
             $link = $host->link(['domain' => 'example']);
             expect($link)->toBe('https://www.example.com');
         });
-        it("builds a scheme less host link", function () {
+        it("builds a scheme less host link", function() {
 
 
             $host = new Host(['pattern' => 'www.{domain}.com']);
             $link = $host->link(['domain' => 'example']);
             expect($link)->toBe('//www.example.com');
         });
-        it("overrides scheme when passed as parameter", function () {
+        it("overrides scheme when passed as parameter", function() {
 
 
             $host = new Host(['pattern' => 'www.{domain}.com']);
@@ -131,7 +131,7 @@ 
             ]);
             expect($link)->toBe('http://www.example.com');
         });
-        it("processes complex pattern", function () {
+        it("processes complex pattern", function() {
 
 
             $host = new Host(['pattern' => '[{subdomains}.]*{domain}.com', 'scheme' => 'https']);
@@ -145,10 +145,10 @@ 
                 'domain' => 'example'
             ]))->toBe('https://a.b.c.example.com');
         });
-        it("throws an exception when variables are missing", function () {
+        it("throws an exception when variables are missing", function() {
 
 
-            $closure = function () {
+            $closure = function() {
 
                 $host = new Host(['pattern' => 'www.{domain}.com']);
                 $link = $host->link();