@@ -231,8 +231,8 @@ discard block |
||
231 | 231 | |
232 | 232 | $route = \implode('', $this->group) . $routePattern; |
233 | 233 | |
234 | - if (substr($route, -1) === '/' && strlen($route) > 1){ |
|
235 | - $route = rtrim($route,'/'); |
|
234 | + if (substr($route, -1) === '/' && strlen($route) > 1) { |
|
235 | + $route = rtrim($route, '/'); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | return $route; |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | ) |
255 | 255 | ); |
256 | 256 | $new->collection[] = $addRoute; |
257 | - } catch (\Exception $e) { |
|
257 | + }catch (\Exception $e) { |
|
258 | 258 | if ($throw) { |
259 | 259 | throw new RouteException($e->getMessage()); |
260 | 260 | } |
@@ -68,7 +68,7 @@ |
||
68 | 68 | $collection->addRoute($routeMethod, $route['path'], $route['handler'], $route['names']); |
69 | 69 | } |
70 | 70 | } |
71 | - } catch (ParseException $e) { |
|
71 | + }catch (ParseException $e) { |
|
72 | 72 | throw new RouterException($e->getMessage()); |
73 | 73 | } |
74 | 74 |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | { |
34 | 34 | $handler = 'my-handler'; |
35 | 35 | $routes = $this->collection; |
36 | - $routes->group('/path', function () use ($routes, $handler) { |
|
36 | + $routes->group('/path', function() use ($routes, $handler) { |
|
37 | 37 | $routes->addRoute(['GET', 'POST'], '/foo', $handler, ['global']); |
38 | - $routes->group('/sub-dir', function () use ($routes, $handler) { |
|
38 | + $routes->group('/sub-dir', function() use ($routes, $handler) { |
|
39 | 39 | $routes->addRoute(['GET'], '/sub-page', $handler, ['sub-dir']); |
40 | 40 | }); |
41 | 41 | }); |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | public function testMergeCollection() |
176 | 176 | { |
177 | 177 | $handler = 'handler::string'; |
178 | - $names = ['routes','names']; |
|
178 | + $names = ['routes', 'names']; |
|
179 | 179 | $collection = new RouteCollection(); |
180 | 180 | $collection->addRoute('GET', '/path', $handler, $names); |
181 | 181 | $collection->addRoute('GET', '/another', $handler, $names); |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | { |
195 | 195 | $this->setExpectedException(RouteException::class); |
196 | 196 | $handler = 'handler::string'; |
197 | - $names = ['routes','names']; |
|
197 | + $names = ['routes', 'names']; |
|
198 | 198 | $collection = new RouteCollection(); |
199 | 199 | $collection->addRoute('GET', '/path', $handler, $names); |
200 | 200 | $collection->addRoute('GET', '/another', $handler, $names); |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $rawPattern = '/mypattern/'; |
241 | 241 | $expectedPattern = '/' . \ltrim($rawPattern, '/'); |
242 | 242 | $expected = \implode('', $groups) . $expectedPattern; |
243 | - $expected = \rtrim($expected,'/'); |
|
243 | + $expected = \rtrim($expected, '/'); |
|
244 | 244 | |
245 | 245 | $this->assertEquals($expected, $collection->formatRoutePattern($rawPattern)); |
246 | 246 | } |
@@ -250,11 +250,11 @@ discard block |
||
250 | 250 | */ |
251 | 251 | public function testMergeGroupNames() |
252 | 252 | { |
253 | - $expected = ['route-name','group-name']; |
|
253 | + $expected = ['route-name', 'group-name']; |
|
254 | 254 | $handler = 'myhandler'; |
255 | 255 | $routes = $this->collection; |
256 | 256 | |
257 | - $routes->group('/path', function () use ($routes, $handler) { |
|
257 | + $routes->group('/path', function() use ($routes, $handler) { |
|
258 | 258 | $routes->addRoute(['GET', 'POST'], '/foo', $handler, ['route-name']); |
259 | 259 | }, ['group-name']); |
260 | 260 |
@@ -14,8 +14,6 @@ |
||
14 | 14 | use Ds\Router\Interfaces\RouteInterface; |
15 | 15 | use Ds\Router\Interfaces\SerializerInterface; |
16 | 16 | use Ds\Router\RouterResponse; |
17 | - |
|
18 | - |
|
19 | 17 | use Symfony\Component\Routing\Matcher\UrlMatcher; |
20 | 18 | use Symfony\Component\Routing\RequestContext; |
21 | 19 | use Symfony\Component\Routing\RouteCollection; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function getSymfonyRouteCollection(RouteCollectionInterface $routes) |
87 | 87 | { |
88 | 88 | |
89 | - if (!$this->options['cacheDisabled'] && file_exists($this->options['cacheFile'])){ |
|
89 | + if (!$this->options['cacheDisabled'] && file_exists($this->options['cacheFile'])) { |
|
90 | 90 | //get cached route collection. |
91 | 91 | } |
92 | 92 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | array('month' => '[0-9]{4}-[0-9]{2}'), // requirements |
100 | 100 | array(), // options |
101 | 101 | '', // host |
102 | - array('https','https'), // schemes |
|
102 | + array('https', 'https'), // schemes |
|
103 | 103 | array('GET') // methods |
104 | 104 | ); |
105 | 105 |
@@ -14,7 +14,6 @@ |
||
14 | 14 | use Ds\Router\Interfaces\RouteInterface; |
15 | 15 | use Ds\Router\Interfaces\SerializerInterface; |
16 | 16 | use Ds\Router\RouterResponse; |
17 | - |
|
18 | 17 | use Symfony\Component\Routing\Matcher\UrlMatcher; |
19 | 18 | use Symfony\Component\Routing\RequestContext; |
20 | 19 | use Symfony\Component\Routing\Route; |