Controllers can now be services.

Author: seeruk

src/Trident/Component/HttpKernel/AbstractKernel.php

@@ -51,12 +51,12 @@ abstract class AbstractKernel implements HttpKernelInterface
     protected $session;
     protected $startTime;
 
-    const VERSION         = '1.0.6-alpha2';
+    const VERSION         = '1.0.6-alpha3';
     const VERSION_ID      = '10006';
     const MAJOR_VERSION   = '1';
     const MINOR_VERSION   = '0';
     const RELEASE_VERSION = '6';
-    const EXTRA_VERSION   = 'alpha2';
+    const EXTRA_VERSION   = 'alpha3';
 
     /**
      * Constructor.
@@ -141,17 +141,9 @@ protected function handleRequest(Request $request, $type)
         $event->setArguments($arguments);
         $this->getDispatcher()->dispatch(KernelEvents::CONTROLLER, $event);
 
-        if (method_exists($controller, 'preAction')) {
-            $controller->preAction();
-        }
-
         // Attempt to get a response from the controller
         $response = call_user_func_array($controller, $arguments);
 
-        if (method_exists($controller, 'postAction')) {
-            $controller->postAction();
-        }
-
         if ( ! $response instanceof Response) {
             $message = sprintf('The controller must return a valid Response (%s given).', $this->varToString($response));
 

src/Trident/Component/HttpKernel/Controller/ControllerResolver.php

@@ -76,11 +76,16 @@ protected function createController($controller)
 
         list($class, $method) = explode('::', $controller, 2);
 
-        if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
+        if ($this->container->has($class)) {
+            $controller = $this->container->get($class);
+        } else {
+            if ( ! class_exists($class)) {
+                throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
+            }
+
+            $controller = new $class();
         }
 
-        $controller = new $class();
         if ($controller instanceof ContainerAwareInterface) {
             $controller->setContainer($this->container);
         }