djsmithme / Router

Src/Router/Handler/Handler.php

Doc Comments +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 
     /**
      * Get route (early) middleware pre-response.
-     * @return mixed
+     * @return string
      */
     public function getPreResponse(){
         return $this->preResponse;
@@ -77,7 +77,7 @@ 
 
     /**
      * Set handler pre-response.
-     * @param $string
+     * @param string $string
      * @return $this
      */
     public function withPreResponse($string){

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      * @param $name
      */
     public function addName($name = ''){
-       $this->name[$name] = $name;
+        $this->name[$name] = $name;
     }
 
     /**

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
      * Set Route name;
      * @param $name
      */
-    public function setName(array $name = []){
+    public function setName(array $name = []) {
             $this->name = $name;
     }
 
@@ -55,7 +55,7 @@ 
      * Add Route name;
      * @param $name
      */
-    public function addName($name = ''){
+    public function addName($name = '') {
        $this->name[$name] = $name;
     }
 
@@ -63,7 +63,7 @@ 
      * Get all added names
      * @return mixed
      */
-    public function getNames(){
+    public function getNames() {
         return (array)$this->name;
     }
 
@@ -71,7 +71,7 @@ 
      * Get route (early) middleware pre-response.
      * @return mixed
      */
-    public function getPreResponse(){
+    public function getPreResponse() {
         return $this->preResponse;
     }
 
@@ -80,7 +80,7 @@ 
      * @param $string
      * @return $this
      */
-    public function withPreResponse($string){
+    public function withPreResponse($string) {
 
         $new = clone $this;
         $new->preResponse = $string;
@@ -98,7 +98,7 @@ 
     public static function __set_state($fields) {
 
         $args = [];
-        foreach($fields as $key => $value){
+        foreach ($fields as $key => $value) {
             $args[] = $value;
         }
 

Tests/Router/Adaptor/FastRouteTest.php

Spacing +7 added lines, -7 removed lines

@@ -5,7 +5,7 @@ 
 use Ds\Router\Adaptor\FastRoute;
 use Ds\Router\Handler\Handler;
 
-class MockHandler extends Handler{
+class MockHandler extends Handler {
 
     function getResponse($vars = [])
     {
@@ -22,7 +22,7 @@ 
     public $fastRoute;
     public $options;
 
-    public function setUp(){
+    public function setUp() {
 
         $this->options = [
             'handler' => '\Tests\Ds\Router\Adaptor\MockHandler',
@@ -41,22 +41,22 @@ 
         $this->fastRoute = new FastRoute($this->options);
     }
 
-    public function testFindHandler(){
+    public function testFindHandler() {
         $result = $this->fastRoute->findHandler('default');
         $this->assertInstanceOf('\Tests\Ds\Router\Adaptor\MockHandler', $result);
     }
 
-    public function testFindHandlerDefault(){
+    public function testFindHandlerDefault() {
         $result = $this->fastRoute->findHandler('notFound');
         $this->assertInstanceOf('\Tests\Ds\Router\Adaptor\MockHandler', $result);
     }
 
-    public function testCheckCacheFileDisabled(){
+    public function testCheckCacheFileDisabled() {
         $expected = true;
         $actual = $this->fastRoute->checkCacheFile();
         $this->assertEquals($expected, $actual);
     }
 
-    public function testGetCachedDispatcher(){}
-    public function testMatch(){}
+    public function testGetCachedDispatcher() {}
+    public function testMatch() {}
 }
\ No newline at end of file

Tests/Router/Handler/ClassHandlerTest.php

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
 
 use Ds\Router\Handler\ClassHandler;
 
-class TestController{
+class TestController {
 
     public $resolveValue;
 
@@ -13,8 +13,8 @@ 
         $this->resolveValue = $resolveValue;
     }
 
-    public function test($var){
-        return 'foo'.$var;
+    public function test($var) {
+        return 'foo' . $var;
     }
 }
 
@@ -29,44 +29,44 @@ 
         $this->controller = 'Tests\Ds\Router\Handler\TestController';
     }
 
-    public function testConstructController(){
-        $reflector = new \ReflectionClass(  $this->handler);
-        $prop = $reflector->getProperty( 'controller' );
+    public function testConstructController() {
+        $reflector = new \ReflectionClass($this->handler);
+        $prop = $reflector->getProperty('controller');
         $prop->setAccessible(true);
         $this->assertEquals($this->controller, $prop->getValue($this->handler));
     }
 
-    public function testConstructMethod(){
-        $reflector = new \ReflectionClass(  $this->handler);
-        $prop = $reflector->getProperty( 'method' );
+    public function testConstructMethod() {
+        $reflector = new \ReflectionClass($this->handler);
+        $prop = $reflector->getProperty('method');
         $prop->setAccessible(true);
         $this->assertEquals('test', $prop->getValue($this->handler));
     }
 
-    public function testConstructPreResponse(){
-        $reflector = new \ReflectionClass(  $this->handler);
-        $prop = $reflector->getProperty( 'preResponse' );
+    public function testConstructPreResponse() {
+        $reflector = new \ReflectionClass($this->handler);
+        $prop = $reflector->getProperty('preResponse');
         $prop->setAccessible(true);
-        $this->assertEquals($this->controller.'::test', $prop->getValue($this->handler));
+        $this->assertEquals($this->controller . '::test', $prop->getValue($this->handler));
     }
 
-    public function testResolveClassInstance(){
+    public function testResolveClassInstance() {
         $handler = $this->handler->resolve();
         $reflector = new \ReflectionClass($handler);
-        $prop = $reflector->getProperty( 'resolved' );
+        $prop = $reflector->getProperty('resolved');
         $prop->setAccessible(true);
         $this->assertInstanceOf($this->controller, $prop->getValue($handler));
     }
 
 
-    public function testGetResponse(){
+    public function testGetResponse() {
         $expected = 'foobar';
         $this->handler->resolve();
         $actual = $this->handler->getResponse('bar');
         $this->assertEquals($expected, $actual);
     }
 
-    public function testGetResponseException(){
+    public function testGetResponseException() {
         $this->setExpectedException('Exception');
         $this->handler->getResponse('bar');
     }

Tests/Router/Handler/HandlerTest.php

Spacing +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
 
 use Ds\Router\Handler\Handler;
 
-class TestHandler extends Handler{
+class TestHandler extends Handler {
 
     public $preResponse = 'pre-response';
     public $name = ['foo' => 'foo'];
@@ -44,7 +44,7 @@ 
         $this->handler = new TestHandler();
     }
 
-    public function testSetName(){
+    public function testSetName() {
         $expected = ['bar'];
         $this->handler->setName($expected);
 
@@ -53,20 +53,20 @@ 
         $reflectionProperty->setAccessible(true);
         $actual = $reflectionProperty->getValue($this->handler);
 
-        $this->assertEquals($expected,$actual);
+        $this->assertEquals($expected, $actual);
     }
 
-    public function testAddName(){
+    public function testAddName() {
         $expected = 'foo';
         $this->handler->addName($expected);
         $reflectionClass = new \ReflectionClass('Tests\Ds\Router\Handler\TestHandler');
         $reflectionProperty = $reflectionClass->getProperty('name');
         $reflectionProperty->setAccessible(true);
         $actual = $reflectionProperty->getValue($this->handler);
-        $this->assertEquals([$expected => $expected],$actual);
+        $this->assertEquals([$expected => $expected], $actual);
     }
     
-    public function testGetNames(){
+    public function testGetNames() {
         $expected = [
             'foo' => 'foo',
         ];
@@ -74,7 +74,7 @@ 
         $this->assertEquals($expected, $this->handler->getNames());
     }
 
-    public function testWithPreResponse(){
+    public function testWithPreResponse() {
      
         $expected = 'preResponse String';
         $this->handler = $this->handler->withPreResponse($expected);
@@ -89,13 +89,13 @@ 
     }
 
 
-    public function testGetPreResponse(){
+    public function testGetPreResponse() {
         $expected = 'preResponse String';
         $this->handler = $this->handler->withPreResponse($expected);
         $this->assertEquals($expected, $this->handler->getPreResponse());
     }
     
-    public function testSetState(){
+    public function testSetState() {
         $actual = TestHandler::__set_state(['state' => 'newState']);
         $expected = new TestHandler('newState');
         $this->assertEquals($expected, $actual);

Tests/Router/RouterResponseTest.php

Spacing +6 added lines, -6 removed lines

@@ -24,13 +24,13 @@ 
         );
     }
 
-    public function testGetHandler(){
+    public function testGetHandler() {
         $handler = $this->response->getHandler();
         $this->assertInstanceOf('\Ds\Router\Interfaces\RouteHandlerInterface', $handler);
         $this->assertSame($this->handler, $handler);
     }
 
-    public function testWithHandler(){
+    public function testWithHandler() {
 
         $newHandler = $this->getMockBuilder('\Ds\Router\Interfaces\RouteHandlerInterface')->getMock();
         $oldHandler = $this->response->getHandler();
@@ -42,11 +42,11 @@ 
      * Returns the Status Code.
      * @return int
      */
-    public function testGetStatusCode(){
-        $this->assertEquals( $this->response->getStatusCode(), 200);
+    public function testGetStatusCode() {
+        $this->assertEquals($this->response->getStatusCode(), 200);
     }
 
-    public function testGetResponseInstance(){
+    public function testGetResponseInstance() {
 
         $httpResponse = $this->getMockBuilder('\Psr\Http\Message\ResponseInterface')->getMock();
 
@@ -54,7 +54,7 @@ 
             ->method('getResponse')
             ->willReturn($httpResponse);
         
-        $response = new RouterResponse( 200, ['get'], $this->handler, []);
+        $response = new RouterResponse(200, ['get'], $this->handler, []);
         $psrResponse = $response->getResponse();
 
         $this->assertInstanceOf('\Psr\Http\Message\ResponseInterface', $psrResponse);

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\Interfaces\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\Interfaces\RouterResponseInterface' , $response);
+        $this->assertInstanceOf('\Ds\Router\Interfaces\RouterResponseInterface', $response);
 
     }
 
-    public function testWithRoutes(){
+    public function testWithRoutes() {
 
         $routes = $this->getMockBuilder('\Ds\Router\Interfaces\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

Indentation +2 added lines, -2 removed lines

@@ -114,10 +114,10 @@
         return \FastRoute\cachedDispatcher(
             function(RouteCollector $r) use ($routes){
                 foreach($routes as $route){
-                   $r->addRoute($route['method'],$route['pattern'],$route['handler']);
+                    $r->addRoute($route['method'],$route['pattern'],$route['handler']);
                 }
             },
-           $this->options
+            $this->options
         );
     }
 

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,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');
         }
 
@@ -27,7 +27,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__;
 
@@ -48,7 +48,7 @@ 
      * @param string $requestTarget
      * @return RouterResponse
      */
-    public function match(array $routes, $method, $requestTarget){
+    public function match(array $routes, $method, $requestTarget) {
 
         $response = [
             'statusCode' => 500,
@@ -56,7 +56,7 @@ 
             'vars' => []
         ];
 
-        $routeInfo =  $this->getCachedDispatcher($routes)->dispatch($method, $requestTarget);
+        $routeInfo = $this->getCachedDispatcher($routes)->dispatch($method, $requestTarget);
 
         switch ($routeInfo[0]) {
             case Dispatcher::FOUND:
@@ -91,10 +91,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];
         }
 
@@ -109,12 +109,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

Src/Router/Adaptor/Adaptor.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
      * Return Adaptor Options
      * @return array
      */
-    public function getOptions(){
+    public function getOptions() {
         return $this->options;
     }
 
@@ -45,7 +45,7 @@ 
      * @param array $options
      * @return void
      */
-    public function withOptions(array $options = []){
+    public function withOptions(array $options = []) {
         $this->options = $options;
         return;
     }

Src/Router/Handler/ClassHandler.php

Spacing +12 added lines, -12 removed lines

@@ -42,18 +42,18 @@ 
      *
      * @return mixed
      */
-    public function resolve(...$arguments){
+    public function resolve(...$arguments) {
 
 
-        $controllerMethod = explode('::',$this->getPreResponse());
+        $controllerMethod = explode('::', $this->getPreResponse());
 
         $this->controller = isset($controllerMethod[0]) ? $controllerMethod[0] : $this->controller;
         $this->method = isset($controllerMethod[1]) ? $controllerMethod[1] : $this->method;
 
-        try{
-            $this->resolveController( $this->controller);
-            $this->resolveMethod( $this->method );
-        }catch(\Exception $e){
+        try {
+            $this->resolveController($this->controller);
+            $this->resolveMethod($this->method);
+        }catch (\Exception $e) {
             $this->resolved = new $this->controller(...$arguments);
         }
 
@@ -69,9 +69,9 @@ 
      * @return ResponseInterface
      * @throws \Exception
      */
-    public function getResponse($vars = [] ){
+    public function getResponse($vars = []) {
 
-        if ($this->resolved === null){
+        if ($this->resolved === null) {
             throw new \Exception("Handler must be resolved before calling getContents().");
         }
 
@@ -88,9 +88,9 @@ 
      * @return bool
      * @throws \Exception controller:{controller} not found
      */
-    private function resolveController($controller){
+    private function resolveController($controller) {
 
-        if ( !class_exists($controller)){
+        if (!class_exists($controller)) {
             throw new \Exception("Controller {$controller} not found");
         }
         return true;
@@ -103,8 +103,8 @@ 
      * @return bool
      * @throws \Exception
      */
-    private function resolveMethod($method){
-        if (method_exists($this->controller,$method)){
+    private function resolveMethod($method) {
+        if (method_exists($this->controller, $method)) {
             return true;
         }
         throw new \Exception("method: {$this->controller}::{$method} not found");

Braces +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         try{
             $this->resolveController( $this->controller);
             $this->resolveMethod( $this->method );
-        }catch(\Exception $e){
+        } catch(\Exception $e){
             $this->resolved = new $this->controller(...$arguments);
         }