symfony · nicolas-grekas · Oct 25, 2017 · ogizanagi · Oct 25, 2017 · nicolas-grekas
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -74,11 +74,5 @@
         <service id="Symfony\Component\Config\Resource\SelfCheckingResourceChecker">
             <tag name="config_cache.resource_checker" priority="-990" />
         </service>
-
-        <service id="Symfony\Component\HttpKernel\EventListener\ServiceResetListener">
-            <argument /> <!-- ResettableServicePass will inject an iterator of initialized services here ($serviceId => $serviceInstance) -->
-            <argument type="collection" /> <!-- ResettableServicePass will inject an array of reset methods here ($serviceId => $method) -->
-            <tag name="kernel.event_subscriber" />
-        </service>
     </services>
 </container>
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
@@ -17,7 +17,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\EventListener\ServiceResetListener;
+use Symfony\Component\HttpKernel\ResettingRequestStack;
 
 /**
  * @author Alexander M. Turek <[email protected]>
@@ -39,7 +39,7 @@ public function __construct($tagName = 'kernel.reset')
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->has(ServiceResetListener::class)) {
+        if (!$container->has('request_stack')) {
             return;
         }
 
@@ -56,14 +56,9 @@ public function process(ContainerBuilder $container)
             $methods[$id] = $attributes['method'];
         }
 
-        if (empty($services)) {
-            $container->removeDefinition(ServiceResetListener::class);
-
-            return;
+        if (!empty($services)) {
+            $container->register('request_stack', ResettingRequestStack::class)
+                ->setArguments(array(new IteratorArgument($services), $methods));
         }
-
-        $container->findDefinition(ServiceResetListener::class)
-            ->replaceArgument(0, new IteratorArgument($services))
-            ->replaceArgument(1, $methods);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ServiceResetListener.php b/src/Symfony/Component/HttpKernel/EventListener/ServiceResetListener.php
diff --git a/src/Symfony/Component/HttpKernel/ResettingRequestStack.php b/src/Symfony/Component/HttpKernel/ResettingRequestStack.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Resets services on second master requests.
+ *
+ * @author Nicolas Grekas <[email protected]>
+ */
+class ResettingRequestStack extends RequestStack
+{
+    private $resetNeeded = false;
+    private $resettableServices;
+    private $resetMethods;
+
+    public function __construct(\Traversable $resettableServices, array $resetMethods)
+    {
+        $this->resettableServices = $resettableServices;
+        $this->resetMethods = $resetMethods;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function push(Request $request)
+    {
+        if ($this->resetNeeded && !$this->getCurrentRequest()) {
+            foreach ($this->resettableServices as $id => $service) {
+                $service->{$this->resetMethods[$id]}();
+            }
+        } else {
+            $this->resetNeeded = true;
+        }
+
+        parent::push($request);
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
@@ -7,8 +7,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
-use Symfony\Component\HttpKernel\EventListener\ServiceResetListener;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ClearableService;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ResettableService;
 
@@ -24,14 +24,13 @@ public function testCompilerPass()
             ->setPublic(true)
             ->addTag('kernel.reset', array('method' => 'clear'));
 
-        $container->register(ServiceResetListener::class)
-            ->setPublic(true)
-            ->setArguments(array(null, array()));
+        $container->register('request_stack', RequestStack::class)
+            ->setPublic(true);
         $container->addCompilerPass(new ResettableServicePass('kernel.reset'));
 
         $container->compile();
 
-        $definition = $container->getDefinition(ServiceResetListener::class);
+        $definition = $container->getDefinition('request_stack');
 
         $this->assertEquals(
             array(
@@ -57,32 +56,10 @@ public function testMissingMethod()
         $container = new ContainerBuilder();
         $container->register(ResettableService::class)
             ->addTag('kernel.reset');
-        $container->register(ServiceResetListener::class)
+        $container->register('request_stack', RequestStack::class)
             ->setArguments(array(null, array()));
         $container->addCompilerPass(new ResettableServicePass('kernel.reset'));
 
         $container->compile();
     }
-
-    public function testCompilerPassWithoutResetters()
-    {
-        $container = new ContainerBuilder();
-        $container->register(ServiceResetListener::class)
-            ->setArguments(array(null, array()));
-        $container->addCompilerPass(new ResettableServicePass());
-
-        $container->compile();
-
-        $this->assertFalse($container->has(ServiceResetListener::class));
-    }
-
-    public function testCompilerPassWithoutListener()
-    {
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new ResettableServicePass());
-
-        $container->compile();
-
-        $this->assertFalse($container->has(ServiceResetListener::class));
-    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ServiceResetListenerTest.php
diff --git a/src/Symfony/Component/HttpKernel/Tests/ResettingRequestStackTest.php b/src/Symfony/Component/HttpKernel/Tests/ResettingRequestStackTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\ResettingRequestStack;
+use Symfony\Component\HttpKernel\Tests\Fixtures\ResettableService;
+
+class ResettingRequestStackTest extends TestCase
+{
+    protected function setUp()
+    {
+        ResettableService::$counter = 0;
+    }
+
+    public function testResetServicesNoOp()
+    {
+        $requestStack = new ResettingRequestStack(new \ArrayIterator(array(new ResettableService())), array('reset'));
+
+        $masterRequest = Request::create('/foo');
+
+        $requestStack->push($masterRequest);
+
+        $this->assertEquals(0, ResettableService::$counter);
+    }
+
+    public function testResetServices()
+    {
+        $requestStack = new ResettingRequestStack(new \ArrayIterator(array(new ResettableService())), array('reset'));
+
+        $masterRequest = Request::create('/foo');
+
+        $requestStack->push($masterRequest);
+        $this->assertEquals(0, ResettableService::$counter);
+
+        $requestStack->pop();
+        $this->assertEquals(0, ResettableService::$counter);
+
+        $requestStack->push($masterRequest);
+        $this->assertEquals(1, ResettableService::$counter);
+
+        $requestStack->push($masterRequest);
+        $this->assertEquals(1, ResettableService::$counter);
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^5.5.9|>=7.0.8",
         "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-        "symfony/http-foundation": "^3.3.11|~4.0",
+        "symfony/http-foundation": "^3.4|~4.0",
         "symfony/debug": "~2.8|~3.0|~4.0",
         "psr/log": "~1.0"
     },