burzum / php-router

src/Router.php

Indentation +23 added lines, -23 removed lines

@@ -214,37 +214,37 @@
      * @return \Lead\Router\RouterInterface
      */
     public function addRoute(RouteInterface $route): RouterInterface {
-         $options['pattern'] = $pattern = $route->getPattern();
-         $options['handler'] = $route->getHandler();
-         $options['scope'] = $route->getScope();
+            $options['pattern'] = $pattern = $route->getPattern();
+            $options['handler'] = $route->getHandler();
+            $options['scope'] = $route->getScope();
 
-         $scheme = $options['scheme'];
-         $host = $options['host'];
+            $scheme = $options['scheme'];
+            $host = $options['host'];
 
-         if (isset($this->_hosts[$scheme][$host])) {
-             $options['host'] = $this->_hosts[$scheme][$host];
-         }
+            if (isset($this->_hosts[$scheme][$host])) {
+                $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 {
-             $this->_hosts[$scheme][$host] = $route->getHost();
-         }
+            if (isset($this->_pattern[$scheme][$host][$patternKey])) {
+                $route = $this->_pattern[$scheme][$host][$patternKey];
+            } else {
+                $this->_hosts[$scheme][$host] = $route->getHost();
+            }
 
-         if (!isset($this->_pattern[$scheme][$host][$patternKey])) {
-             $this->_pattern[$scheme][$host][$patternKey] = $route;
-         }
+            if (!isset($this->_pattern[$scheme][$host][$patternKey])) {
+                $this->_pattern[$scheme][$host][$patternKey] = $route;
+            }
 
-         $methods = $route->getMethods();
-         foreach ($methods as $method) {
-             $this->_routes[$scheme][$host][strtoupper($method)][] = $route;
-         }
+            $methods = $route->getMethods();
+            foreach ($methods as $method) {
+                $this->_routes[$scheme][$host][strtoupper($method)][] = $route;
+            }
 
-         $this->_data[$route->getName()] = $route;
+            $this->_data[$route->getName()] = $route;
 
-         return $this;
+            return $this;
     }
 
     /**

Spacing +5 added lines, -5 removed lines

@@ -186,7 +186,7 @@ 
     public function setBasePath(string $basePath): self
     {
         $basePath = trim($basePath, '/');
-        $this->_basePath = $basePath ? '/' . $basePath : '';
+        $this->_basePath = $basePath ? '/'.$basePath : '';
 
         return $this;
     }
@@ -225,7 +225,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];
@@ -289,7 +289,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];
@@ -303,7 +303,7 @@ 
             $this->_pattern[$scheme][$host][$patternKey] = $instance;
         }
 
-        $methods = $options['methods'] ? (array)$options['methods'] : [];
+        $methods = $options['methods'] ? (array) $options['methods'] : [];
 
         $instance->allow($methods);
 
@@ -430,7 +430,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;

spec/Suite/Router.spec.php

Spacing +48 added lines, -48 removed lines

@@ -71,7 +71,7 @@ 
         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->getMethods())->toBe(['POST', 'PUT']);
@@ -89,7 +89,7 @@ 
         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->getMethods())->toBe(['POST', 'PUT']);
@@ -106,8 +106,8 @@ 
 
         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' => 'bar', 'methods' => ['PUT']], function () {});
+            $r->bind('foo/bar', ['name' => 'foo', 'methods' => ['POST']], function() {});
+            $r->bind('foo/bar', ['name' => 'bar', 'methods' => ['PUT']], function() {});
 
             $route = $r->route('foo/bar', 'POST');
             expect($route->name)->toBe('foo');
@@ -148,7 +148,7 @@ 
             $r->basePath('app');
 
             $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', [
@@ -164,7 +164,7 @@ 
             $r = $this->router;
             $r->group('foo', ['name' => 'foz'], function($r) {
                 $r->group('bar', ['name' => 'baz'], function($r) {
-                    $r->bind('{var1}', ['name' => 'quz'], function () {});
+                    $r->bind('{var1}', ['name' => 'quz'], function() {});
                 });
             });
 
@@ -177,7 +177,7 @@ 
 
             $r = $this->router;
             $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');
@@ -202,7 +202,7 @@ 
 
             $r = $this->router;
             $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');
@@ -233,7 +233,7 @@ 
         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([
@@ -253,7 +253,7 @@ 
         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');
@@ -268,7 +268,7 @@ 
         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([
@@ -283,7 +283,7 @@ 
         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([
@@ -425,7 +425,7 @@ 
             $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');
@@ -453,13 +453,13 @@ 
         it("supports RESTful routes", function() {
 
             $r = $this->router;
-            $r->get('foo/bar', function () {});
-            $r->head('foo/bar', function () {});
-            $r->post('foo/bar', function () {});
-            $r->put('foo/bar', function () {});
-            $r->patch('foo/bar', function () {});
-            $r->delete('foo/bar', function () {});
-            $r->options('foo/bar', function () {});
+            $r->get('foo/bar', function() {});
+            $r->head('foo/bar', function() {});
+            $r->post('foo/bar', function() {});
+            $r->put('foo/bar', function() {});
+            $r->patch('foo/bar', function() {});
+            $r->delete('foo/bar', function() {});
+            $r->options('foo/bar', function() {});
 
             $methods = ['OPTIONS', 'DELETE', 'PATCH', 'PUT', 'POST', 'HEAD', 'GET'];
 
@@ -489,7 +489,7 @@ 
         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([
@@ -506,7 +506,7 @@ 
         it("dispatches HEAD requests on matching GET routes if the HEAD routes are missing", function() {
 
             $r = $this->router;
-            $r->get('foo/bar', function () { return 'GET'; });
+            $r->get('foo/bar', function() { return 'GET'; });
 
             $route = $r->route('foo/bar', 'HEAD');
             expect($route->getMethods())->toBe(['GET']);
@@ -517,8 +517,8 @@ 
 
             $r = $this->router;
 
-            $r->head('foo/bar', function () { return 'HEAD'; });
-            $r->get('foo/bar', function () { return 'GET'; });
+            $r->head('foo/bar', function() { return 'HEAD'; });
+            $r->get('foo/bar', function() { return 'GET'; });
 
             $route = $r->route('foo/bar', 'HEAD');
             expect($route->getMethods())->toBe(['GET', 'HEAD']);
@@ -528,7 +528,7 @@ 
         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([
@@ -542,7 +542,7 @@ 
 
         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]);
@@ -562,7 +562,7 @@ 
         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([
@@ -610,7 +610,7 @@ 
 
                 $r = $this->router;
                 $r->group('foo', function($r) {
-                    $r->bind('{var1}', function () {});
+                    $r->bind('{var1}', function() {});
                 });
 
             });
@@ -623,9 +623,9 @@ 
 
             });
 
-            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');
                 };
@@ -640,7 +640,7 @@ 
 
                 $r = $this->router;
                 $r->group('foo', function($r) {
-                    $r->bind('[{var1}]', function () {});
+                    $r->bind('[{var1}]', function() {});
                 });
 
             });
@@ -653,9 +653,9 @@ 
 
             });
 
-            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');
                 };
@@ -671,7 +671,7 @@ 
                 $r = $this->router;
                 $r->group('foo', ['host' => 'foo.{domain}.bar'], function($r) {
                     $r->group('bar', function($r) {
-                        $r->bind('{var1}', function () {});
+                        $r->bind('{var1}', function() {});
                     });
                 });
 
@@ -688,9 +688,9 @@ 
 
             });
 
-            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');
                 };
@@ -706,7 +706,7 @@ 
                 $r = $this->router;
                 $r->group('foo', ['scheme' => 'http'], function($r) {
                     $r->group('bar', function($r) {
-                        $r->bind('{var1}', function () {});
+                        $r->bind('{var1}', function() {});
                     });
                 });
 
@@ -722,9 +722,9 @@ 
 
             });
 
-            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');
                 };
@@ -738,7 +738,7 @@ 
             $r = $this->router;
             $r->group('foo', ['namespace' => 'My'], function($r) {
                 $r->group('bar', ['namespace' => 'Name'], function($r) {
-                    $r->bind('{var1}', ['namespace' => 'Space'], function () {});
+                    $r->bind('{var1}', ['namespace' => 'Space'], function() {});
                 });
             });
 
@@ -767,10 +767,10 @@ 
             $r = $this->router;
 
             $mw1 = function($request, $response, $next) {
-                return '1' . $next() . '1';
+                return '1'.$next().'1';
             };
             $mw2 = function($request, $response, $next) {
-                return '2' . $next() . '2';
+                return '2'.$next().'2';
             };
 
             $r->apply($mw1, $mw2);
@@ -797,9 +797,9 @@ 
             $r = $this->router;
 
             $r->apply(function($request, $response, $next) {
-                return '1' . $next() . '1';
+                return '1'.$next().'1';
             })->apply(function($request, $response, $next) {
-                return '2' . $next() . '2';
+                return '2'.$next().'2';
             });
 
             $route = $r->bind('/foo/bar', function($route) {
@@ -818,19 +818,19 @@ 
             $r = $this->router;
 
             $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->bind('{bar}', ['name' => 'bar'], function () {
+                $r->bind('{bar}', ['name' => 'bar'], function() {
                     return 'A';
                 });
             })->apply(function($request, $response, $next) {
-                return '2' . $next() . '2';
+                return '2'.$next().'2';
             });
 
             $route = $r->route('foo/foo');