Merge pull request #11 from samsonasik/update-composer

Upgrade to Penny 0.7.0
pennyphp · Nov 29, 2015 · 7d82bc7 · 7d82bc7
2 parents 9503463 + a741dcb
commit 7d82bc7
Show file tree

Hide file tree

Showing 4 changed files with 286 additions and 177 deletions.
diff --git a/app/Dispatcher/SymfonyDispatcher.php b/app/Dispatcher/SymfonyDispatcher.php
@@ -2,35 +2,43 @@
 
 namespace App\Dispatcher;
 
-use Penny\Exception\MethodNotAllowed;
-use Penny\Exception\RouteNotFound;
+use FastRoute\Dispatcher;
+use Penny\Exception\MethodNotAllowedException;
+use Penny\Exception\RouteNotFoundException;
+use Penny\Route\RouteInfo;
 use Symfony\Component\HttpFoundation\Request;
 
 class SymfonyDispatcher
 {
     private $router;
+    private $container;
 
-    public function __construct($router)
+    public function __construct($router, $container)
     {
         $this->router = $router;
+        $this->container = $container;
     }
 
     public function __invoke(Request $request)
     {
         $routeInfo = $this->router->dispatch($request->getMethod(), $request->getPathInfo());
         switch ($routeInfo[0]) {
-            case \FastRoute\Dispatcher::NOT_FOUND:
-                throw new RouteNotFound;
+            case Dispatcher::NOT_FOUND:
+                throw new RouteNotFoundException;
                 break;
-            case \FastRoute\Dispatcher::METHOD_NOT_ALLOWED:
-                throw new MethodNotAllowed;
+            case Dispatcher::METHOD_NOT_ALLOWED:
+                throw new MethodNotAllowedException;
                 break;
-            case \FastRoute\Dispatcher::FOUND:
-                return $routeInfo;
+            case Dispatcher::FOUND:
+                $controller = $this->container->get($routeInfo[1][0]);
+                $eventName = sprintf('%s.%s', strtolower($routeInfo[1][0]), $routeInfo[1][1]);
+
+                return new RouteInfo($eventName, [$controller, $routeInfo[1][1]], $routeInfo[2]);
+
                 break;
             default:
                 throw new \Exception(null, 500);
                 break;
         }
     }
-}
+}
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "penny/classic-app",
+    "name": "penny/bookshelf",
     "type": "project",
     "require": {
-        "gianarb/penny": "~0.5",
+        "gianarb/penny": "~0.7",
         "doctrine/orm": ">=2.5,<2.7",
         "symfony/form": "~2.7,>=2.7.2",
         "twig/twig": "~1.20|~2.0",
@@ -11,7 +11,7 @@
         "symfony/http-foundation": "^2.7"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "~5.0"
     },
     "autoload": {
         "psr-4": {