Merge pull request #9 from webfactory/feature/dispatch_sub_requests

Allow to dispatch the legacy app in sub-requests

Author: MatthiasMolitor

.gitignore

@@ -0,0 +1,6 @@
+# IDE
+/.idea/
+
+# Composer
+/vendor/
+/composer.lock

.idea/codeStyleSettings.xml

@@ -1,7 +1,17 @@
 Changelog
 =========
 
-Version 1.1 
+Version 1.3
+-----------
+
+* Symfony sub-requests can be dispatched to the legacy app (but the legacy app is still called at most once per web request)
+
+Version 1.2
+-----------
+
+* Legacy front controllers don't have to return the HTTP status code anymore
+
+Version 1.1
 -----------
 
 * Added a way to embed Symfony 2 output into the legacy response (#5)

.idea/encodings.xml

@@ -21,6 +21,10 @@ class LegacyApplicationDispatchingEventListener
     protected $container;
     protected $reader;
     protected $stopwatch;
+
+    /**
+     * @var Filter[]
+     */
     protected $filters = array();
 
     public function __construct(ContainerInterface $container, Reader $reader)
@@ -36,10 +40,6 @@ public function addFilter(Filter $filter)
 
     public function onKernelController(FilterControllerEvent $event)
     {
-        if ($event->getRequestType() != HttpKernelInterface::MASTER_REQUEST) {
-            return;
-        }
-
         if (!is_array($controller = $event->getController())) {
             return;
         }
@@ -68,6 +68,9 @@ public function onKernelController(FilterControllerEvent $event)
         }
     }
 
+    /**
+     * @return HttpKernelInterface
+     */
     protected function getLegacyApplication()
     {
         return $this->container->get('webfactory_legacy_integration.legacy_application');

.idea/misc.xml

@@ -28,7 +28,11 @@ public function setLegacyKernel(HttpKernelInterface $kernel)
 
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
-        return $this->response = $this->legacyKernel->handle($request, $type, $catch);
+        if ($this->response === null) {
+            // Dispatch legacy application only once.
+            $this->response = $this->legacyKernel->handle($request, $type, $catch);
+        }
+        return $this->response;
     }
 
     public function isDispatched()

.idea/modules.xml

@@ -12,7 +12,7 @@ Later, after the Symfony2 Controller has been executed and a Twig template is be
 rendered, fragments of the "legacy response" can be retrieved and be used as part
 of the output.
 
-That way, you can start with your legacy applcation and Symfony2 in coexistence
+That way, you can start with your legacy application and Symfony2 in coexistence
 next to each other. You can then incrementally start to shift functionality over
 to the Symfony2 stack while maintaining a coherent user experience.
 
@@ -48,7 +48,7 @@ The legacy "bootstrap" file
 ---
 
 You must provide a single file that can be `include()`ed in order to run your
-legacy applcation. Typically you will already have this - it should be your
+legacy application. Typically you will already have this - it should be your
 legacy application's front controller.
 
 If you are running PHP < 5.4, this file should _return_ the HTTP status code