djsmithme / Router

Tests/Router/RouterTest.php

Spacing +11 added lines, -11 removed lines

@@ -44,45 +44,45 @@
         );
     }
 
-    public function testGetAdaptor(){
+    public function testGetAdaptor() {
         $expected = $this->adaptor;
         $actual = $this->router->getAdaptor();
         $this->assertEquals($expected, $actual);
     }
 
-    public function testWithAdaptor(){
+    public function testWithAdaptor() {
         $newAdaptor = $this->getMockBuilder('\Ds\Router\AdaptorInterface')->getMock();
         $newRouter = $this->router->withAdaptor($newAdaptor);
         $this->assertNotSame($this->adaptor, $newRouter->getAdaptor());
     }
 
-    public function testGetRouterResponse(){
+    public function testGetRouterResponse() {
 
         $request = $this->getMockBuilder('\Psr\Http\Message\RequestInterface')->getMock();
 
-        $routerResponse = new RouterResponse(200,[],null,[]);
+        $routerResponse = new RouterResponse(200, [], null, []);
 
-        $this->adaptor->expects( $this->once() )
+        $this->adaptor->expects($this->once())
             ->method('match')
             ->willReturn($routerResponse);
 
-        $this->routes->expects( $this->once() )
+        $this->routes->expects($this->once())
             ->method('getRoutes')
             ->willReturn([]);
 
         $response = $this->router->getRouterResponse($request);
-        $this->assertInstanceOf('\Ds\Router\RouterResponseInterface' , $response);
+        $this->assertInstanceOf('\Ds\Router\RouterResponseInterface', $response);
 
     }
 
-    public function testWithRoutes(){
+    public function testWithRoutes() {
 
         $routes = $this->getMockBuilder('\Ds\Router\RoutesInterface')->getMock();
         $this->router->withRoutes($routes);
 
-        $reflector = new \ReflectionClass( '\Ds\Router\Router' );
-        $prop = $reflector->getProperty( 'routes' );
-        $prop->setAccessible( true );
+        $reflector = new \ReflectionClass('\Ds\Router\Router');
+        $prop = $reflector->getProperty('routes');
+        $prop->setAccessible(true);
 
         $this->assertSame($routes, $prop->getValue($this->router));
 

Src/Router/Adaptor/FastRoute.php

Spacing +11 added lines, -11 removed lines

@@ -23,7 +23,7 @@ 
         $this->options = $options;
         $this->checkCacheFile();
 
-        if (!isset($this->options['errorHandlers']['default'])){
+        if (!isset($this->options['errorHandlers']['default'])) {
             throw new \Exception('Error Handlers must be specified');
         }
 
@@ -35,7 +35,7 @@ 
      * Check cache file and update self::$cacheDisabled
      * @return bool
      */
-    public function checkCacheFile(){
+    public function checkCacheFile() {
         $cacheDir = isset($this->options['cacheFile'])
             ? $this->options['cacheFile'] : __DIR__;
 
@@ -56,11 +56,11 @@ 
      * @param string $requestTarget
      * @return RouterResponse
      */
-    public function match(array $routes, $method, $requestTarget){
+    public function match(array $routes, $method, $requestTarget) {
 
         //remove end slash variation.
-        $formattedRequest = rtrim($requestTarget,"/");
-        $formattedRequest = $formattedRequest."/";
+        $formattedRequest = rtrim($requestTarget, "/");
+        $formattedRequest = $formattedRequest . "/";
 
         $response = [
             'statusCode' => 500,
@@ -68,7 +68,7 @@ 
             'vars' => []
         ];
 
-        $routeInfo =  $this->getCachedDispatcher($routes)->dispatch($method, $formattedRequest);
+        $routeInfo = $this->getCachedDispatcher($routes)->dispatch($method, $formattedRequest);
 
         switch ($routeInfo[0]) {
             case Dispatcher::FOUND:
@@ -103,10 +103,10 @@ 
      * @param $code
      * @return mixed
      */
-    public function findHandler($code){
+    public function findHandler($code) {
         $handlerName = $this->options['handler'];
         $handlerArgs = $this->options['errorHandlers']['default'];
-        if (isset($this->options['errorHandlers'][$code])){
+        if (isset($this->options['errorHandlers'][$code])) {
             $handlerArgs = $this->options['errorHandlers'][$code];
         }
 
@@ -121,12 +121,12 @@ 
      * @param array $routes
      * @return FastRouteAdaptor
      */
-    public function getCachedDispatcher(array $routes = []){
+    public function getCachedDispatcher(array $routes = []) {
 
         return \FastRoute\cachedDispatcher(
             function(RouteCollector $r) use ($routes){
-                foreach($routes as $route){
-                   $r->addRoute($route['method'],$route['pattern'],$route['handler']);
+                foreach ($routes as $route) {
+                   $r->addRoute($route['method'], $route['pattern'], $route['handler']);
                 }
             },
            $this->options