Merge pull request #165 from ppi/feature/chain-router-caching

Symfony Kernel Injection For Bundle Loading

Author: dragoonis

src/App.php

@@ -16,9 +16,11 @@
 use PPI\Framework\Router\ChainRouter;
 use PPI\Framework\ServiceManager\ServiceManager;
 use PPI\Framework\ServiceManager\ServiceManagerBuilder;
+use PPI\Framework\Debug\ExceptionHandler;
 use Symfony\Component\Debug\Debug;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 
 /**
@@ -120,6 +122,11 @@ class App implements AppInterface
      */
     private $router;
 
+    /**
+     * @var KernelInterface
+     */
+    private $symfonyKernel;
+
     /**
      * App constructor.
      *
@@ -165,6 +172,10 @@ public function boot()
             return $this;
         }
 
+        if($this->isDebug()) {
+            ExceptionHandler::register(true, 'UTF-8', 'PPI Framework', self::VERSION, true);
+        }
+
         $this->serviceManager = $this->buildServiceManager();
         $this->log('debug', sprintf('Booting %s ...', $this->name));
 
@@ -213,7 +224,19 @@ public function run(HttpRequest $request = null, HttpResponse $response = null)
             $response = new HttpResponse();
         }
 
-        $response = $this->dispatch($request, $response);
+        // Create a copy of request, as it's by-ref passed into $this->dispatch() and gets modified.
+        $cleanRequest = clone $request;
+        try {
+            $response = $this->dispatch($request, $response);
+        } catch (ResourceNotFoundException $e) {
+
+            if($this->symfonyKernel === null) {
+                throw $e;
+            }
+            $response = $this->symfonyKernel->handle($cleanRequest);
+        }
+
+
         $response->send();
 
         return $response;
@@ -235,8 +258,18 @@ public function dispatch(HttpRequest $request, HttpResponse $response)
             $this->boot();
         }
 
-        // Routing
-        $routeParams = $this->handleRouting($request);
+
+        // cache like a mother fucker
+//        if(!$this->hasRouteInCache($request)) {
+            $routeParams = $this->handleRouting($request);
+//            $this->setRouteInCache($request, $routeParams);
+            // @todo - move these 2 lines to setRouteInCache()
+//            $routingCache = $this->serviceManager->get('RoutingCache');
+//            $routingCache->set($request->getPathInfo(), $routeParams);
+//        } else {
+//            $routeParams = $this->getRouteFromCache($request);
+//        }
+
         $request->attributes->add($routeParams);
 
         // Resolve our Controller
@@ -505,11 +538,22 @@ public function getConfig()
         return $this->serviceManager->get('Config');
     }
 
+    /**
+     * @return string
+     */
     public function serialize()
     {
         return serialize(array($this->environment, $this->debug));
     }
 
+    /**
+     * @param KernelInterface $kernel
+     */
+    public function setSymfonyKernel(KernelInterface $kernel)
+    {
+        $this->symfonyKernel = $kernel;
+    }
+
     public function unserialize($data)
     {
         list($environment, $debug) = unserialize($data);

src/Autoload.php

@@ -41,7 +41,7 @@ class Autoload
      *
      * @static
      */
-    protected static $_options = array();
+    public static $_options = array();
 
     /**
      * @todo Add inline documentation.
@@ -77,7 +77,7 @@ public static function config(array $config)
     public static function add($key, $path)
     {
         self::$_registeredNamespaces[$key] = true;
-        self::$_options['loader']->add($key, $path);
+        self::$_options['loader']->addPsr4($key, $path);
     }
 
     /**

src/Config/ConfigLoader.php

@@ -15,6 +15,7 @@
 use PPI\Framework\Config\Loader\IniFileLoader;
 use PPI\Framework\Config\Loader\PhpFileLoader;
 use PPI\Framework\Config\Loader\YamlFileLoader;
+use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Loader\LoaderResolver;
 
 /**
@@ -62,7 +63,7 @@ public function load($resource, $type = null)
      *
      * @return DelegatingLoader The loader
      */
-    protected function getLoader()
+    public function getLoader()
     {
         if (null === $this->loader) {
             $locator  = new FileLocator($this->paths);

src/Config/Loader/YamlFileLoader.php

@@ -13,6 +13,7 @@
 use Symfony\Component\Config\Loader\FileLoader;
 use Symfony\Component\Yaml\Parser as YamlParser;
 use Zend\Stdlib\ArrayUtils;
+use \InvalidArgumentException;
 
 /**
  * YamlFileLoader loads app configuration from a YAML file.

src/Module/Controller/ControllerResolver.php

@@ -11,6 +11,7 @@
 namespace PPI\Framework\Module\Controller;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolver as BaseControllerResolver;
 use Zend\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -89,6 +90,10 @@ protected function instantiateController($class)
             $controller->setServiceLocator($this->serviceManager);
         }
 
+        if($controller instanceof ContainerAwareInterface) {
+            $controller->setContainer($this->serviceManager->get('SymfonyContainer'));
+        }
+
         return $controller;
     }
 }

src/Router/ChainRouter.php

@@ -26,6 +26,8 @@ class ChainRouter extends BaseChainRouter
      */
     protected $matchedRouteRequest;
 
+    private $routingCache;
+
     /**
      * @param array $parameters
      *
@@ -71,10 +73,12 @@ public function matchRequest(Request $request)
         try {
             $parameters = parent::matchRequest($request);
             $this->matchedRouteRequest = $request;
-
             return $parameters;
         } catch (\Exception $e) {
             throw $e;
         }
+
+
     }
+
 }

src/Router/Wrapper/AuraRouterWrapper.php

@@ -25,6 +25,11 @@
  */
 class AuraRouterWrapper implements RouterInterface, RequestMatcherInterface
 {
+    public function getRouter()
+    {
+        return self::class;
+    }
+
     /**
      * @var AuraRouter
      */

src/ServiceManager/Factory/RouterFactory.php

@@ -50,6 +50,10 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         $logger = $serviceLocator->has('Logger') ? $serviceLocator->get('Logger') : null;
 
         $chainRouter = new ChainRouter($logger);
+        if($serviceLocator->has('RoutingCache')) {
+            $chainRouter->setCache($serviceLocator->get('RoutingCache'));
+        }
+
         $chainRouter->setContext($requestContext);
 
         $allModuleRoutes = $serviceLocator->get('ModuleDefaultListener')->getRoutes();