Merge pull request #95 from wdalmut/feature/routeinfo-direct

Drop static RouteInfo matched method
pennyphp · Oct 20, 2015 · d2cf62d · d2cf62d
2 parents be2b8e6 + b636f99
commit d2cf62d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 28 deletions.
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
@@ -6,27 +6,26 @@
 use Exception;
 use ReflectionClass;
 use FastRoute\Dispatcher as BaseDispatcher;
-use FastRoute\Dispatcher as FastRouterDispatcherInterface;
-use Penny\Route\FastPsr7RouteInfo;
 use Penny\Exception\MethodNotAllowed;
 use Penny\Exception\RouteNotFound;
 use Psr\Http\Message\RequestInterface;
+use Penny\Route\RouteInfo;
 
 class Dispatcher
 {
     /**
      * Inner dispatcher.
      *
-     * @var FastRouterDispatcherInterface
+     * @var BaseDispatcher
      */
     private $router;
 
     /**
      * Class constructor with required FastRoute dispatcher implementation.
      *
-     * @param FastRouterDispatcherInterface $router Inner router (based on Nikic FastRouter).
+     * @param BaseDispatcher $router Inner router (based on Nikic FastRouter).
      */
-    public function __construct(FastRouterDispatcherInterface $router, ContainerInterface $container)
+    public function __construct(BaseDispatcher $router, ContainerInterface $container)
     {
         $this->router = $router;
         $this->container = $container;
@@ -62,10 +61,10 @@ public function __invoke(RequestInterface $request)
             case BaseDispatcher::FOUND:
                 $controller = $this->container->get($routeInfo[1][0]);
                 $method = $routeInfo[1][1];
-                $function = (new ReflectionClass($controller))->getShortName();
+                $function = strtolower((new ReflectionClass($controller))->getShortName());
+                $eventName = "{$function}.{$method}"; // this improve ~1us
 
-                $eventName = sprintf('%s.%s', strtolower($function), $method);
-                $routeInfo = FastPsr7RouteInfo::matched($eventName, [$controller, $routeInfo[1][1]], $routeInfo[2]);
+                $routeInfo = new RouteInfo($eventName, [$controller, $routeInfo[1][1]], $routeInfo[2]);
                 return $routeInfo;
             default:
                 throw new Exception(null, 500);

diff --git a/src/Route/FastPsr7RouteInfo.php → src/Route/RouteInfo.php b/src/Route/FastPsr7RouteInfo.php → src/Route/RouteInfo.php
@@ -1,19 +1,17 @@
 <?php
 namespace Penny\Route;
 
-class FastPsr7RouteInfo implements RouteInfoInterface
+class RouteInfo implements RouteInfoInterface
 {
     private $name;
     private $callable;
     private $params;
 
-    public static function matched($name, callable $callable, $params = [])
+    public function __construct($name, callable $callable, $params = [])
     {
-        $obj = new self();
-        $obj->name = $name;
-        $obj->callable = $callable;
-        $obj->params = $params;
-        return $obj;
+        $this->name = $name;
+        $this->callable = $callable;
+        $this->params = $params;
     }
 
     public function getName()

diff --git a/src/Route/RouteInfoInterface.php b/src/Route/RouteInfoInterface.php
@@ -3,7 +3,6 @@
 
 interface RouteInfoInterface
 {
-    public static function matched($name, callable $callable, $params);
     public function getName();
     public function getCallable();
     public function getParams();

diff --git a/tests/Route/RouteInfoTest.php b/tests/Route/RouteInfoTest.php
@@ -2,26 +2,21 @@
 namespace PennyTest\Route;
 
 use PHPUnit_Framework_TestCase;
-use Penny\Route\FastPsr7RouteInfo;
 use Penny\Route\RouteInfoInterface;
 use TestApp\Controller\IndexController;
+use Penny\Route\RouteInfo;
 
 class RouteInfoTest extends PHPUnit_Framework_TestCase
 {
     public function testRouteInfoImplementInterface()
     {
-        $routeInfo = new FastPsr7RouteInfo();
+        $routeInfo = new RouteInfo('', function(){}, []);
         $this->assertInstanceOf(RouteInfoInterface::class, $routeInfo);
     }
 
     public function testMatched()
     {
-        $fastRouteInfo = [
-            [],
-            [new IndexController(), 'index'],
-            ["id" => 5]
-        ];
-        $routeInfo = FastPsr7RouteInfo::matched("index.try", $fastRouteInfo[1], $fastRouteInfo[2]);
-        $this->assertSame("index.try", $routeInfo->getName());
+        $routeInfo = new RouteInfo('index.try', [new IndexController(), 'index'], ['id' => 5]);
+        $this->assertSame('index.try', $routeInfo->getName());
     }
 }
diff --git a/tests/Utils/FastSymfonyDispatcher.php b/tests/Utils/FastSymfonyDispatcher.php
@@ -2,9 +2,9 @@
 
 namespace PennyTest\Utils;
 
-use Symfony\Component\HttpFoundation\Request;
-use Penny\Route\FastPsr7RouteInfo;
 use ReflectionClass;
+use Penny\Route\RouteInfo;
+use Symfony\Component\HttpFoundation\Request;
 
 class FastSymfonyDispatcher
 {
@@ -37,7 +37,7 @@ public function __invoke(Request $request)
                 $callback = function($controller, $fastRouteInfo) {
                     return call_user_func([$controller, $fastRouteInfo[1][1]]);
                 };
-                $routeInfo = FastPsr7RouteInfo::matched($eventName, $callback($controller, $fastRouteInfo[1][1]), $fastRouteInfo[2]);
+                $routeInfo = new RouteInfo($eventName, $callback($controller, $fastRouteInfo[1][1]), $fastRouteInfo[2]);
                 return $routeInfo;
                 break;
             default: