@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | { |
| 31 | 31 | // setup |
| 32 | 32 | $router = new SimpleRouter(); |
| 33 | - $router->addRoute('/catalog/[i:foo]/', function (): void { |
|
| 33 | + $router->addRoute('/catalog/[i:foo]/', function(): void { |
|
| 34 | 34 | // do nothing |
| 35 | 35 | }); |
| 36 | 36 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $router = new SimpleRouter(); |
| 50 | 50 | $router->addRoute( |
| 51 | 51 | '/catalog/[a:cat_id]/', |
| 52 | - function (string $route, array $parameters): string { |
|
| 52 | + function(string $route, array $parameters): string { |
|
| 53 | 53 | return $parameters['cat_id']; |
| 54 | 54 | }); |
| 55 | 55 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $router = new SimpleRouter(); |
| 67 | 67 | $router->addRoute( |
| 68 | 68 | '/catalog/[a:cat_id]/[i:item_id]', |
| 69 | - function (string $route, array $parameters): string { |
|
| 69 | + function(string $route, array $parameters): string { |
|
| 70 | 70 | return $parameters['cat_id'] . $parameters['item_id']; |
| 71 | 71 | }); |
| 72 | 72 | |
@@ -81,10 +81,10 @@ discard block |
||
| 81 | 81 | public function testValidRouteParameter(): void |
| 82 | 82 | { |
| 83 | 83 | $router = new SimpleRouter(); |
| 84 | - $router->addRoute('/catalog/all/', function (string $route): string { |
|
| 84 | + $router->addRoute('/catalog/all/', function(string $route): string { |
|
| 85 | 85 | return $route; |
| 86 | 86 | }); |
| 87 | - $router->addRoute('/catalog/[i:cat_id]', function (string $route): string { |
|
| 87 | + $router->addRoute('/catalog/[i:cat_id]', function(string $route): string { |
|
| 88 | 88 | return $route; |
| 89 | 89 | }); |
| 90 | 90 | |
@@ -108,8 +108,8 @@ discard block |
||
| 108 | 108 | { |
| 109 | 109 | // setup |
| 110 | 110 | $router = new Router(); |
| 111 | - for ($i = 0; $i < 15; $i ++) { |
|
| 112 | - $router->addRoute('/multiple/' . $i . '/[i:id]', function () { |
|
| 111 | + for ($i = 0; $i < 15; $i++) { |
|
| 112 | + $router->addRoute('/multiple/' . $i . '/[i:id]', function() { |
|
| 113 | 113 | return 'done!'; |
| 114 | 114 | }); |
| 115 | 115 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | public function testArrayRoutes(): void |
| 102 | 102 | { |
| 103 | 103 | $router = new SimpleRouter(); |
| 104 | - $router->addRoute('/part1/part2/', function (string $route): string { |
|
| 104 | + $router->addRoute('/part1/part2/', function(string $route): string { |
|
| 105 | 105 | return $route; |
| 106 | 106 | }, 'GET'); |
| 107 | 107 | |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $this->setRequestUri('/catalog/item/'); |
| 122 | 122 | |
| 123 | 123 | $router = new SimpleRouter(); |
| 124 | - $router->addRoute('/catalog/item/', function (string $route): string { |
|
| 124 | + $router->addRoute('/catalog/item/', function(string $route): string { |
|
| 125 | 125 | return $route; |
| 126 | 126 | }, 'GET'); |
| 127 | 127 | |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | $this->setRequestUri('/'); |
| 141 | 141 | |
| 142 | 142 | $router = new SimpleRouter(); |
| 143 | - $router->addRoute('/index/', function (string $route): string { |
|
| 143 | + $router->addRoute('/index/', function(string $route): string { |
|
| 144 | 144 | return $route; |
| 145 | 145 | }, 'GET'); |
| 146 | 146 | |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | $this->setRequestUri('/'); |
| 161 | 161 | |
| 162 | 162 | $router = new SimpleRouter(); |
| 163 | - $router->addRoute('/index/', function (string $route): string { |
|
| 163 | + $router->addRoute('/index/', function(string $route): string { |
|
| 164 | 164 | return $route; |
| 165 | 165 | }, [ |
| 166 | 166 | 'GET', |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | public function testClearMethod(string $method): void |
| 283 | 283 | { |
| 284 | 284 | $router = new SimpleRouter(); |
| 285 | - $router->addRoute('/route-to-clear/', function () use ($method) { |
|
| 285 | + $router->addRoute('/route-to-clear/', function() use ($method) { |
|
| 286 | 286 | return $method; |
| 287 | 287 | }, $method); |
| 288 | 288 | $router->clear(); |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | $_SERVER['REQUEST_METHOD'] = $method; |
| 309 | 309 | |
| 310 | 310 | $router = new SimpleRouter(); |
| 311 | - $router->addRoute('/catalog/', function (string $route): string { |
|
| 311 | + $router->addRoute('/catalog/', function(string $route): string { |
|
| 312 | 312 | return $route; |
| 313 | 313 | }, $method); |
| 314 | 314 | |
@@ -324,10 +324,10 @@ discard block |
||
| 324 | 324 | { |
| 325 | 325 | // setup |
| 326 | 326 | $router = new SimpleRouter(); |
| 327 | - $router->addRoute('/searching-static-route/', function (string $route) { |
|
| 327 | + $router->addRoute('/searching-static-route/', function(string $route) { |
|
| 328 | 328 | return $route; |
| 329 | 329 | }); |
| 330 | - $router->addRoute('/searching-param-route/[i:id]/', function (string $route) { |
|
| 330 | + $router->addRoute('/searching-param-route/[i:id]/', function(string $route) { |
|
| 331 | 331 | return $route; |
| 332 | 332 | }); |
| 333 | 333 | |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | // setup |
| 31 | 31 | $router = new SimpleRouter(); |
| 32 | - $router->addRoute('/catalog/[i:foo]/', function () { |
|
| 32 | + $router->addRoute('/catalog/[i:foo]/', function() { |
|
| 33 | 33 | // do nothing |
| 34 | 34 | }); |
| 35 | 35 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | // setup |
| 50 | 50 | $_SERVER['REQUEST_METHOD'] = 'HEAD'; |
| 51 | 51 | $router = new SimpleRouter(); |
| 52 | - $router->addRoute('/catalog/[i:foo]/', function () { |
|
| 52 | + $router->addRoute('/catalog/[i:foo]/', function() { |
|
| 53 | 53 | // do nothing |
| 54 | 54 | }); |
| 55 | 55 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $router = new SimpleRouter(); |
| 70 | 70 | $router->addRoute('/catalog/[il:cat_id]/', [ |
| 71 | 71 | $this, |
| 72 | - function () { |
|
| 72 | + function() { |
|
| 73 | 73 | return 1; |
| 74 | 74 | } |
| 75 | 75 | ]); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $router = new SimpleRouter(); |
| 94 | 94 | $router->addRoute('/catalog/[i:cat_id]', [ |
| 95 | 95 | $this, |
| 96 | - function () { |
|
| 96 | + function() { |
|
| 97 | 97 | return 1; |
| 98 | 98 | } |
| 99 | 99 | ]); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | $router = new SimpleRouter(); |
| 121 | 121 | $router->addRoute('/catalog/[i:cat_id]', [ |
| 122 | 122 | $this, |
| 123 | - function () { |
|
| 123 | + function() { |
|
| 124 | 124 | return 1; |
| 125 | 125 | } |
| 126 | 126 | ]); |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $router = new SimpleRouter(); |
| 148 | 148 | $router->addRoute('/catalog/[i:item_id]', [ |
| 149 | 149 | $this, |
| 150 | - function () { |
|
| 150 | + function() { |
|
| 151 | 151 | return 1; |
| 152 | 152 | } |
| 153 | 153 | ]); |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | { |
| 192 | 192 | // setup |
| 193 | 193 | $router = new SimpleRouter(); |
| 194 | - $router->addRoute($route, function () { |
|
| 194 | + $router->addRoute($route, function() { |
|
| 195 | 195 | // do nothing |
| 196 | 196 | }); |
| 197 | 197 | |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | $router = new SimpleRouter(); |
| 211 | 211 | $router->addRoute('/catalog/[unexisting-type:i]/item/', [ |
| 212 | 212 | $this, |
| 213 | - function () { |
|
| 213 | + function() { |
|
| 214 | 214 | return 1; |
| 215 | 215 | } |
| 216 | 216 | ]); |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | '/catalog/[i:cat_id]/item/[unexisting-type-trace:item_id]/', |
| 234 | 234 | [ |
| 235 | 235 | $this, |
| 236 | - function () { |
|
| 236 | + function() { |
|
| 237 | 237 | return 1; |
| 238 | 238 | } |
| 239 | 239 | ]); |
@@ -30,19 +30,19 @@ discard block |
||
| 30 | 30 | // setup |
| 31 | 31 | $route = '/route-with-middleware/'; |
| 32 | 32 | $router = new SimpleRouter(); |
| 33 | - $router->registerMiddleware('*', function () { |
|
| 33 | + $router->registerMiddleware('*', function() { |
|
| 34 | 34 | return [ |
| 35 | 35 | 1, |
| 36 | 36 | 2 |
| 37 | 37 | ]; |
| 38 | 38 | }); |
| 39 | - $router->addRoute($route, function (int $i, int $j) { |
|
| 39 | + $router->addRoute($route, function(int $i, int $j) { |
|
| 40 | 40 | return [ |
| 41 | 41 | $i, |
| 42 | 42 | $j |
| 43 | 43 | ]; |
| 44 | 44 | }); |
| 45 | - $router->registerMiddleware($route, function (int $i, int $j) { |
|
| 45 | + $router->registerMiddleware($route, function(int $i, int $j) { |
|
| 46 | 46 | return [ |
| 47 | 47 | $i, |
| 48 | 48 | $j |
@@ -66,13 +66,13 @@ discard block |
||
| 66 | 66 | $route = '/route/[i:id]'; |
| 67 | 67 | $router = new SimpleRouter(); |
| 68 | 68 | |
| 69 | - $router->addRoute($route, function (string $route, array $parameters): array { |
|
| 69 | + $router->addRoute($route, function(string $route, array $parameters): array { |
|
| 70 | 70 | return $parameters; |
| 71 | 71 | }); |
| 72 | 72 | |
| 73 | 73 | $router->registerMiddleware( |
| 74 | 74 | $route, |
| 75 | - function (string $route, array $parameters) { |
|
| 75 | + function(string $route, array $parameters) { |
|
| 76 | 76 | $parameters['_second'] = $parameters['id']; |
| 77 | 77 | $parameters['id'] += 9; |
| 78 | 78 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | // This middleware is broken, don't parse the result |
| 86 | 86 | $router->registerMiddleware( |
| 87 | 87 | $route, |
| 88 | - function (string $route, array $parameters) { |
|
| 88 | + function(string $route, array $parameters) { |
|
| 89 | 89 | $parameters['_dont_set_this'] = true; |
| 90 | 90 | |
| 91 | 91 | return null; |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | $router->registerMiddleware( |
| 95 | 95 | $route, |
| 96 | - function (string $route, array $parameters) { |
|
| 96 | + function(string $route, array $parameters) { |
|
| 97 | 97 | $parameters['_third'] = $parameters['id']; |
| 98 | 98 | $parameters['id'] *= 2; |
| 99 | 99 | |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | $router->registerMiddleware( |
| 107 | 107 | '*', |
| 108 | - function (string $route, array $parameters) { |
|
| 108 | + function(string $route, array $parameters) { |
|
| 109 | 109 | $parameters['_first'] = $parameters['id']; |
| 110 | 110 | $parameters['id'] *= 2; |
| 111 | 111 | |
@@ -40,8 +40,8 @@ |
||
| 40 | 40 | // setup |
| 41 | 41 | RouterUnitTestUtils::setRequestMethod('GET'); |
| 42 | 42 | $router = new SimpleRouter(); |
| 43 | - for ($i = 1; $i <= $amount; $i ++) { |
|
| 44 | - $router->addRoute('/param/[i:id]/' . $i, function () use ($i): int { |
|
| 43 | + for ($i = 1; $i <= $amount; $i++) { |
|
| 44 | + $router->addRoute('/param/[i:id]/' . $i, function() use ($i): int { |
|
| 45 | 45 | return $i; |
| 46 | 46 | }); |
| 47 | 47 | } |
@@ -162,12 +162,12 @@ discard block |
||
| 162 | 162 | $router = new SimpleRouter(); |
| 163 | 163 | $router->addType('date', DateRouterType::class); |
| 164 | 164 | if (is_string($pattern)) { |
| 165 | - $router->addRoute($pattern, function () { |
|
| 165 | + $router->addRoute($pattern, function() { |
|
| 166 | 166 | // do nothing |
| 167 | 167 | }, $method); |
| 168 | 168 | } else { |
| 169 | 169 | foreach ($pattern as $r) { |
| 170 | - $router->addRoute($r, function () { |
|
| 170 | + $router->addRoute($r, function() { |
|
| 171 | 171 | // do nothing |
| 172 | 172 | }, $method); |
| 173 | 173 | } |
@@ -185,8 +185,8 @@ discard block |
||
| 185 | 185 | { |
| 186 | 186 | // setup |
| 187 | 187 | $router = new SimpleRouter(); |
| 188 | - for ($i = 0; $i < 15; $i ++) { |
|
| 189 | - $router->addRoute('/multiple/' . $i . '/[i:id]', function () { |
|
| 188 | + for ($i = 0; $i < 15; $i++) { |
|
| 189 | + $router->addRoute('/multiple/' . $i . '/[i:id]', function() { |
|
| 190 | 190 | return 'done!'; |
| 191 | 191 | }); |
| 192 | 192 | } |
@@ -206,22 +206,22 @@ discard block |
||
| 206 | 206 | { |
| 207 | 207 | // setup |
| 208 | 208 | $router = new SimpleRouter(); |
| 209 | - $router->addRoute('/user/[s:login]/custom-field/[s:name]', function () { |
|
| 209 | + $router->addRoute('/user/[s:login]/custom-field/[s:name]', function() { |
|
| 210 | 210 | return 'get-custom-field'; |
| 211 | 211 | }); |
| 212 | - $router->addRoute('/user/[s:login]/custom-field/[s:name]/add', function () { |
|
| 212 | + $router->addRoute('/user/[s:login]/custom-field/[s:name]/add', function() { |
|
| 213 | 213 | return 'add-custom-field'; |
| 214 | 214 | }); |
| 215 | - $router->addRoute('/user/[s:login]/custom-field/[s:name]/delete', function () { |
|
| 215 | + $router->addRoute('/user/[s:login]/custom-field/[s:name]/delete', function() { |
|
| 216 | 216 | return 'delete-custom-field'; |
| 217 | 217 | }); |
| 218 | - $router->addRoute('/restore-password/[s:token]', function () { |
|
| 218 | + $router->addRoute('/restore-password/[s:token]', function() { |
|
| 219 | 219 | return 'restore-password'; |
| 220 | 220 | }); |
| 221 | - $router->addRoute('/reset-password/[s:token]', function () { |
|
| 221 | + $router->addRoute('/reset-password/[s:token]', function() { |
|
| 222 | 222 | return 'reset-password'; |
| 223 | 223 | }); |
| 224 | - $router->addRoute('/user/[s:login]/delete', function () { |
|
| 224 | + $router->addRoute('/user/[s:login]/delete', function() { |
|
| 225 | 225 | return 'user-delete'; |
| 226 | 226 | }); |
| 227 | 227 | |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | { |
| 61 | 61 | // setup |
| 62 | 62 | $router = new SimpleRouter(); |
| 63 | - $router->addRoute($route, function () { |
|
| 63 | + $router->addRoute($route, function() { |
|
| 64 | 64 | return 'named route result'; |
| 65 | 65 | }, 'GET', 'named-route'); |
| 66 | 66 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | # 1, lambda |
| 68 | 68 | [ |
| 69 | 69 | '/one-component-lambda/', |
| 70 | - function () { |
|
| 70 | + function() { |
|
| 71 | 71 | return 'Hello lambda!'; |
| 72 | 72 | }, |
| 73 | 73 | 'Hello lambda!' |
@@ -106,16 +106,16 @@ discard block |
||
| 106 | 106 | { |
| 107 | 107 | $route = '/catalog/'; |
| 108 | 108 | $router = $this->getRouter(); |
| 109 | - $router->addRoute($route, function () { |
|
| 109 | + $router->addRoute($route, function() { |
|
| 110 | 110 | return 'POST'; |
| 111 | 111 | }, 'POST'); |
| 112 | - $router->addRoute($route, function () { |
|
| 112 | + $router->addRoute($route, function() { |
|
| 113 | 113 | return 'GET'; |
| 114 | 114 | }, 'GET'); |
| 115 | - $router->addRoute($route, function () { |
|
| 115 | + $router->addRoute($route, function() { |
|
| 116 | 116 | return 'PUT'; |
| 117 | 117 | }, 'PUT'); |
| 118 | - $router->addRoute($route, function () { |
|
| 118 | + $router->addRoute($route, function() { |
|
| 119 | 119 | return RouterUnitTestUtils::DELETE_REQUEST_METHOD; |
| 120 | 120 | }, RouterUnitTestUtils::DELETE_REQUEST_METHOD); |
| 121 | 121 | |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | { |
| 152 | 152 | // setup |
| 153 | 153 | $router = $this->getRouter(); |
| 154 | - $router->setNoProcessorFoundErrorHandler(function () { |
|
| 154 | + $router->setNoProcessorFoundErrorHandler(function() { |
|
| 155 | 155 | $this->errorHandler(); |
| 156 | 156 | }); |
| 157 | 157 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | foreach ($routes as $item) { |
| 96 | 96 | $matches = []; |
| 97 | 97 | |
| 98 | - if (preg_match('/^'.$this->_getRouteMatcherRegExPattern($item['pattern']).'$/', $route, $matches)) { |
|
| 98 | + if (preg_match('/^' . $this->_getRouteMatcherRegExPattern($item['pattern']) . '$/', $route, $matches)) { |
|
| 99 | 99 | $names = $this->_getParameterNames($item['pattern']); |
| 100 | 100 | |
| 101 | 101 | $this->parameters = []; |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | { |
| 185 | 185 | $routerTrimmed = trim($router, '/'); |
| 186 | 186 | |
| 187 | - if (! isset($this->middleware[$routerTrimmed])) { |
|
| 187 | + if (!isset($this->middleware[$routerTrimmed])) { |
|
| 188 | 188 | $this->middleware[$routerTrimmed] = []; |
| 189 | 189 | } |
| 190 | 190 | |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | $this->parameters |
| 216 | 216 | ]; |
| 217 | 217 | |
| 218 | - if (! count($middleWares)) { |
|
| 218 | + if (!count($middleWares)) { |
|
| 219 | 219 | return $result; |
| 220 | 220 | } |
| 221 | 221 | |