symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+3-1Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/ResettableService.php
Copy file name to clipboard
+27Lines changed: 27 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/ResettableService.php
Copy file name to clipboard
+27Lines changed: 27 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/KernelTestCaseTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Functional/KernelTestCaseTest.php
+11Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/KernelTestCaseTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Functional/KernelTestCaseTest.php
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/TestServiceContainer/services.yml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/TestServiceContainer/services.yml
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/TestServiceContainer/services.yml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/TestServiceContainer/services.yml
+5Lines changed: 5 additions & 0 deletions
@@ -160,7 +160,9 @@ protected static function ensureKernelShutdown()
             static::$kernel->shutdown();
             static::$booted = false;
 
-            if ($container instanceof ResetInterface) {
+            if ($container->has('services_resetter')) {
+                $container->get('services_resetter')->reset();
+            } elseif ($container instanceof ResetInterface) {
                 $container->reset();
             }
         }
 
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer;
+
+class ResettableService
+{
+    private $count = 0;
+
+    public function myCustomName(): void
+    {
+        ++$this->count;
+    }
+
+    public function getCount(): int
+    {
+        return $this->count;
+    }
+}
@@ -15,6 +15,7 @@
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\NonPublicService;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\PrivateService;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\PublicService;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\ResettableService;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\UnusedPrivateService;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -41,4 +42,14 @@ public function testThatPrivateServicesAreAvailableIfTestConfigIsEnabled()
         $this->assertTrue($container->has('private_service'));
         $this->assertFalse($container->has(UnusedPrivateService::class));
     }
+
+    public function testServicesAreResetOnEnsureKernelShutdown()
+    {
+        static::bootKernel(['test_case' => 'TestServiceContainer']);
+
+        $resettableService = static::getContainer()->get(ResettableService::class);
+
+        self::ensureKernelShutdown();
+        self::assertSame(1, $resettableService->getCount());
+    }
 }
@@ -13,3 +13,8 @@ services:
         arguments:
             - '@Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\NonPublicService'
             - '@Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\PrivateService'
+
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\ResettableService:
+        public: true
+        tags:
+            - kernel.reset: { method: 'myCustomName' }
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,9 @@ protected static function ensureKernelShutdown()`
`160`	`160`	`static::$kernel->shutdown();`
`161`	`161`	`static::$booted = false;`
`162`	`162`
`163`		`- if ($container instanceof ResetInterface) {`
	`163`	`+ if ($container->has('services_resetter')) {`
	`164`	`+ $container->get('services_resetter')->reset();`
	`165`	`+ } elseif ($container instanceof ResetInterface) {`
`164`	`166`	`$container->reset();`
`165`	`167`	`}`
`166`	`168`	`}`