Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 5fbd0dc06244 · 2022-03-02T14:21:45.000+01:00
* 6.0:
  -
  -
  Fix merge
  Fix merge
  [HttpKernel] Guard against bad profile data
  Fix merge
  [FrameworkBundle] Fix resetting container between tests
  Fix deprecations on PHP 8.2
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -29,7 +29,7 @@ jobs:
           - php: '8.1'
             mode: low-deps
           - php: '8.2'
-            mode: experimental
+            #mode: experimental
       fail-fast: false
 
     runs-on: ubuntu-20.04
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -13,9 +13,9 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Persistence\ManagerRegistry;
-use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\ObjectManager;
 use Doctrine\Persistence\ObjectRepository;
 use Symfony\Bridge\Doctrine\Tests\DoctrineTestHelper;
@@ -111,7 +111,7 @@ protected function createEntityManagerMock($repositoryMock)
             ->willReturn($repositoryMock)
         ;
 
-        $classMetadata = $this->createMock(ClassMetadata::class);
+        $classMetadata = $this->createMock(ClassMetadataInfo::class);
         $classMetadata
             ->expects($this->any())
             ->method('hasField')
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php
@@ -159,7 +159,8 @@ public function testExtractEnum()
 
         $validator = Validation::createValidatorBuilder()
             ->addMethodMapping('loadValidatorMetadata')
-            ->enableAnnotationMapping()
+            ->enableAnnotationMapping(true)
+            ->addDefaultDoctrineAnnotationReader()
             ->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), '{^Symfony\\\\Bridge\\\\Doctrine\\\\Tests\\\\Fixtures\\\\DoctrineLoader}'))
             ->getValidator()
         ;
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -185,6 +185,7 @@ function ($definition) {
     }
 }
 
+#[\AllowDynamicProperties]
 final class DummyClass implements DummyInterface, SunnyInterface
 {
     private $ref;
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -28,14 +29,18 @@ public function process(ContainerBuilder $container)
         // "annotation_reader" at build time don't get any cache
         foreach ($container->findTaggedServiceIds('annotations.cached_reader') as $id => $tags) {
             $reader = $container->getDefinition($id);
+            $reader->setPublic(false);
             $properties = $reader->getProperties();
 
             if (isset($properties['cacheProviderBackup'])) {
                 $provider = $properties['cacheProviderBackup']->getValues()[0];
                 unset($properties['cacheProviderBackup']);
                 $reader->setProperties($properties);
-                $container->set($id, null);
-                $container->setDefinition($id, $reader->replaceArgument(1, $provider));
+                $reader->replaceArgument(1, $provider);
+            } elseif (4 <= \count($arguments = $reader->getArguments()) && $arguments[3] instanceof ServiceClosureArgument) {
+                $arguments[1] = $arguments[3]->getValues()[0];
+                unset($arguments[3]);
+                $reader->setArguments($arguments);
             }
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1610,9 +1610,10 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         $container
             ->getDefinition('annotations.cached_reader')
+            ->setPublic(true) // set to false in AddAnnotationsCachedReaderPass
             ->replaceArgument(2, $config['debug'])
-            // temporary property to lazy-reference the cache provider without using it until AddAnnotationsCachedReaderPass runs
-            ->setProperty('cacheProviderBackup', new ServiceClosureArgument(new Reference($cacheService)))
+            // reference the cache provider without using it until AddAnnotationsCachedReaderPass runs
+            ->addArgument(new ServiceClosureArgument(new Reference($cacheService)))
             ->addTag('annotations.cached_reader')
         ;
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -22,7 +22,6 @@
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\HttpKernel\Profiler\Profile as HttpProfile;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Simulates a browser and makes requests to a Kernel object.
@@ -157,12 +156,8 @@ protected function doRequest(object $request): Response
         // avoid shutting down the Kernel if no request has been performed yet
         // WebTestCase::createClient() boots the Kernel but do not handle a request
         if ($this->hasPerformedRequest && $this->reboot) {
-            $container = $this->kernel->getContainer();
+            $this->kernel->boot();
             $this->kernel->shutdown();
-
-            if ($container instanceof ResetInterface) {
-                $container->reset();
-            }
         } else {
             $this->hasPerformedRequest = true;
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -15,7 +15,6 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * KernelTestCase is the base class for tests needing a Kernel.
@@ -35,8 +34,6 @@ abstract class KernelTestCase extends TestCase
 
     protected static $booted = false;
 
-    private static ?ContainerInterface $kernelContainer = null;
-
     protected function tearDown(): void
     {
         static::ensureKernelShutdown();
@@ -69,12 +66,11 @@ protected static function bootKernel(array $options = []): KernelInterface
     {
         static::ensureKernelShutdown();
 
-        static::$kernel = static::createKernel($options);
-        static::$kernel->boot();
+        $kernel = static::createKernel($options);
+        $kernel->boot();
+        self::$kernel = $kernel;
         static::$booted = true;
 
-        self::$kernelContainer = static::$kernel->getContainer();
-
         return static::$kernel;
     }
 
@@ -95,7 +91,7 @@ protected static function getContainer(): ContainerInterface
         }
 
         try {
-            return self::$kernelContainer->get('test.service_container');
+            return self::$kernel->getContainer()->get('test.service_container');
         } catch (ServiceNotFoundException $e) {
             throw new \LogicException('Could not find service "test.service_container". Try updating the "framework.test" config to "true".', 0, $e);
         }
@@ -144,14 +140,9 @@ protected static function createKernel(array $options = []): KernelInterface
     protected static function ensureKernelShutdown()
     {
         if (null !== static::$kernel) {
+            static::$kernel->boot();
             static::$kernel->shutdown();
             static::$booted = false;
         }
-
-        if (self::$kernelContainer instanceof ResetInterface) {
-            self::$kernelContainer->reset();
-        }
-
-        self::$kernelContainer = null;
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/KernelBrowserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/KernelBrowserTest.php
@@ -51,6 +51,16 @@ public function testEnableRebootKernel()
         $client->request('GET', '/');
     }
 
+    public function testRequestAfterKernelShutdownAndPerformedRequest()
+    {
+        $this->expectNotToPerformAssertions();
+
+        $client = static::createClient(['test_case' => 'TestServiceContainer']);
+        $client->request('GET', '/');
+        static::ensureKernelShutdown();
+        $client->request('GET', '/');
+    }
+
     private function getKernelMock()
     {
         $mock = $this->getMockBuilder($this->getKernelClass())
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -54,21 +54,16 @@ public function testPrune()
     public function testKnownTagVersionsTtl()
     {
         $itemsPool = new FilesystemAdapter('', 10);
-        $tagsPool = $this->createMock(AdapterInterface::class);
+        $tagsPool = new ArrayAdapter();
 
         $pool = new TagAwareAdapter($itemsPool, $tagsPool, 10);
 
         $item = $pool->getItem('foo');
         $item->tag(['baz']);
         $item->expiresAfter(100);
 
-        $tag = $this->createMock(CacheItemInterface::class);
-        $tag->expects(self::exactly(2))->method('get')->willReturn(10);
-        $tag->expects(self::exactly(2))->method('set')->willReturn($tag);
-
-        $tagsPool->expects(self::exactly(2))->method('getItems')->willReturn(new \ArrayIterator([
-            'baz'.TagAwareAdapter::TAGS_PREFIX => $tag,
-        ]));
+        $tag = $tagsPool->getItem('baz'.TagAwareAdapter::TAGS_PREFIX);
+        $tagsPool->save($tag->set(10));
 
         $pool->save($item);
         $this->assertTrue($pool->getItem('foo')->isHit());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
@@ -56,6 +56,7 @@ public static function configureStatic1()
 
 class BarUserClass
 {
+    public $foo;
     public $bar;
 
     public function __construct(BarClass $bar)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo.php
@@ -4,6 +4,7 @@
 
 class FooClass
 {
+    public $qux;
     public $foo;
     public $moo;
 
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -1075,11 +1075,11 @@ private function convertToHtmlEntities(string $htmlContent, string $charset = 'U
         set_error_handler(function () { throw new \Exception(); });
 
         try {
-            return mb_convert_encoding($htmlContent, 'HTML-ENTITIES', $charset);
+            return mb_encode_numericentity($htmlContent, [0x80, 0xFFFF, 0, 0xFFFF], $charset);
         } catch (\Exception|\ValueError $e) {
             try {
                 $htmlContent = iconv($charset, 'UTF-8', $htmlContent);
-                $htmlContent = mb_convert_encoding($htmlContent, 'HTML-ENTITIES', 'UTF-8');
+                $htmlContent = mb_encode_numericentity($htmlContent, [0x80, 0xFFFF, 0, 0xFFFF], 'UTF-8');
             } catch (\Exception|\ValueError $e) {
             }
 
diff --git a/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php b/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php
@@ -17,6 +17,8 @@
  */
 class MockStream
 {
+    public $context;
+
     /**
      * Opens file or URL.
      *
diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -121,7 +121,11 @@ public function read(string $token): ?Profile
             $file = 'compress.zlib://'.$file;
         }
 
-        return $this->createProfileFromData($token, unserialize(file_get_contents($file)));
+        if (!$data = unserialize(file_get_contents($file))) {
+            return null;
+        }
+
+        return $this->createProfileFromData($token, $data);
     }
 
     /**
@@ -287,7 +291,11 @@ protected function createProfileFromData(string $token, array $data, Profile $pa
                 $file = 'compress.zlib://'.$file;
             }
 
-            $profile->addChild($this->createProfileFromData($token, unserialize(file_get_contents($file)), $profile));
+            if (!$childData = unserialize(file_get_contents($file))) {
+                continue;
+            }
+
+            $profile->addChild($this->createProfileFromData($token, $childData, $profile));
         }
 
         return $profile;
diff --git a/src/Symfony/Component/Notifier/Tests/Event/FailedMessageEventTest.php b/src/Symfony/Component/Notifier/Tests/Event/FailedMessageEventTest.php
@@ -15,7 +15,7 @@
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-final class FailedMessageEventTest extends TestCase
+class FailedMessageEventTest extends TestCase
 {
     /**
      * @dataProvider messagesProvider
@@ -47,6 +47,8 @@ public function testFailedMessageEventIsDisptachIfError()
         $clientMock = $this->createMock(HttpClientInterface::class);
 
         $transport = new class($clientMock, $eventDispatcherMock) extends AbstractTransport {
+            public $exception;
+
             public function __construct($client, EventDispatcherInterface $dispatcher = null)
             {
                 $this->exception = new NullTransportException();
@@ -65,6 +67,7 @@ public function supports(MessageInterface $message): bool
 
             public function __toString(): string
             {
+                return '';
             }
         };
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ObjectDummy.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ObjectDummy.php
@@ -2,6 +2,7 @@
 
 namespace Symfony\Component\Serializer\Tests\Normalizer\Features;
 
+#[\AllowDynamicProperties]
 class ObjectDummy
 {
     protected $foo;
diff --git a/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php b/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php
@@ -123,7 +123,7 @@ private function getParts(string $originalTrans): array
             return [[true, true, $originalTrans]];
         }
 
-        $html = mb_convert_encoding($originalTrans, 'HTML-ENTITIES', mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8');
+        $html = mb_encode_numericentity($originalTrans, [0x80, 0xFFFF, 0, 0xFFFF], mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8');
 
         $useInternalErrors = libxml_use_internal_errors(true);
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -28,6 +28,7 @@ class ImageValidatorTest extends ConstraintValidatorTestCase
     protected $imageLandscape;
     protected $imagePortrait;
     protected $image4By3;
+    protected $image16By9;
     protected $imageCorrupted;
     protected $notAnImage;
 
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -960,7 +960,7 @@ protected function dumpLine(int $depth, bool $endOfValue = false)
         }
         $this->lastDepth = $depth;
 
-        $this->line = mb_convert_encoding($this->line, 'HTML-ENTITIES', 'UTF-8');
+        $this->line = mb_encode_numericentity($this->line, [0x80, 0xFFFF, 0, 0xFFFF], 'UTF-8');
 
         if (-1 === $depth) {
             AbstractDumper::dumpLine(0);
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -175,7 +175,7 @@ public function testHtmlDump()
   <span class=sf-dump-meta>trace</span>: {<samp data-depth=2 class=sf-dump-compact>
     <span class=sf-dump-meta title="%sExceptionCasterTest.php
 Stack level %d."><span class="sf-dump-ellipsis sf-dump-ellipsis-path">%s%eVarDumper</span><span class="sf-dump-ellipsis sf-dump-ellipsis-path">%e</span>Tests%eCaster%eExceptionCasterTest.php</span>:<span class=sf-dump-num>%d</span>
-     &hellip;%d
+     &#8230;%d
   </samp>}
 </samp>}
 </bar>
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -166,11 +166,13 @@ public function testCastObjectStorageDumpsInfo()
 
     public function testCastArrayObject()
     {
-        $var = new \ArrayObject([123]);
+        $var = new
+            #[\AllowDynamicProperties]
+            class([123]) extends \ArrayObject {};
         $var->foo = 234;
 
         $expected = <<<EOTXT
-ArrayObject {
+ArrayObject@anonymous {
   +"foo": 234
   -storage: array:1 [
     0 => 123
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php
@@ -66,7 +66,7 @@ public function testGet()
   <span class=sf-dump-key>6</span> => <span class=sf-dump-num>{$intMax}</span>
   "<span class=sf-dump-key>str</span>" => "<span class=sf-dump-str title="5 characters">d&%s;j&%s;<span class="sf-dump-default sf-dump-ns">\\n</span></span>"
   <span class=sf-dump-key>7</span> => b"""
-    <span class=sf-dump-str title="11 binary or non-UTF-8 characters">&eacute;<span class="sf-dump-default">\\x01</span>test<span class="sf-dump-default">\\t</span><span class="sf-dump-default sf-dump-ns">\\n</span></span>
+    <span class=sf-dump-str title="11 binary or non-UTF-8 characters">&#233;<span class="sf-dump-default">\\x01</span>test<span class="sf-dump-default">\\t</span><span class="sf-dump-default sf-dump-ns">\\n</span></span>
     <span class=sf-dump-str title="11 binary or non-UTF-8 characters">ing</span>
     """
   "<span class=sf-dump-key>[]</span>" => []
diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php
@@ -3,6 +3,7 @@
 namespace Symfony\Component\VarDumper\Tests\Fixture;
 
 if (!class_exists(\Symfony\Component\VarDumper\Tests\Fixture\DumbFoo::class)) {
+    #[\AllowDynamicProperties]
     class DumbFoo
     {
         public $foo = 'foo';
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -106,7 +106,15 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                 }
                 $properties = ['SplObjectStorage' => ["\0" => $properties]];
                 $arrayValue = (array) $value;
-            } elseif ($value instanceof \Serializable || $value instanceof \__PHP_Incomplete_Class) {
+            } elseif ($value instanceof \Serializable
+                || $value instanceof \__PHP_Incomplete_Class
+                || $value instanceof \DatePeriod
+                || (\PHP_VERSION_ID >= 80200 && (
+                    $value instanceof \DateTimeInterface
+                    || $value instanceof \DateTimeZone
+                    || $value instanceof \DateInterval
+                ))
+            ) {
                 ++$objectsCount;
                 $objectsPool[$value] = [$id = \count($objectsPool), serialize($value), [], 0];
                 $value = new Reference($id);
diff --git a/src/Symfony/Component/VarExporter/Internal/Hydrator.php b/src/Symfony/Component/VarExporter/Internal/Hydrator.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime-legacy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime-legacy.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime.php
diff --git a/src/Symfony/Component/VarExporter/Tests/InstantiatorTest.php b/src/Symfony/Component/VarExporter/Tests/InstantiatorTest.php
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ public function testExtractEnum()`
`159`	`159`
`160`	`160`	`$validator = Validation::createValidatorBuilder()`
`161`	`161`	`->addMethodMapping('loadValidatorMetadata')`
`162`		`- ->enableAnnotationMapping()`
	`162`	`+ ->enableAnnotationMapping(true)`
	`163`	`+ ->addDefaultDoctrineAnnotationReader()`
`163`	`164`	`->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), '{^Symfony\\\\Bridge\\\\Doctrine\\\\Tests\\\\Fixtures\\\\DoctrineLoader}'))`
`164`	`165`	`->getValidator()`
`165`	`166`	`;`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ function ($definition) {`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
	`188`	`+#[\AllowDynamicProperties]`
`188`	`189`	`final class DummyClass implements DummyInterface, SunnyInterface`
`189`	`190`	`{`
`190`	`191`	`private $ref;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`16`	`16`	`use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;`
`17`	`17`	`use Symfony\Component\HttpKernel\KernelInterface;`
`18`		`-use Symfony\Contracts\Service\ResetInterface;`
`19`	`18`
`20`	`19`	`/**`
`21`	`20`	`* KernelTestCase is the base class for tests needing a Kernel.`
`@@ -35,8 +34,6 @@ abstract class KernelTestCase extends TestCase`
`35`	`34`
`36`	`35`	`protected static $booted = false;`
`37`	`36`
`38`		`- private static ?ContainerInterface $kernelContainer = null;`
`39`		`-`
`40`	`37`	`protected function tearDown(): void`
`41`	`38`	`{`
`42`	`39`	`static::ensureKernelShutdown();`
`@@ -69,12 +66,11 @@ protected static function bootKernel(array $options = []): KernelInterface`
`69`	`66`	`{`
`70`	`67`	`static::ensureKernelShutdown();`
`71`	`68`
`72`		`- static::$kernel = static::createKernel($options);`
`73`		`- static::$kernel->boot();`
	`69`	`+ $kernel = static::createKernel($options);`
	`70`	`+ $kernel->boot();`
	`71`	`+ self::$kernel = $kernel;`
`74`	`72`	`static::$booted = true;`
`75`	`73`
`76`		`- self::$kernelContainer = static::$kernel->getContainer();`
`77`		`-`
`78`	`74`	`return static::$kernel;`
`79`	`75`	`}`
`80`	`76`
`@@ -95,7 +91,7 @@ protected static function getContainer(): ContainerInterface`
`95`	`91`	`}`
`96`	`92`
`97`	`93`	`try {`
`98`		`- return self::$kernelContainer->get('test.service_container');`
	`94`	`+ return self::$kernel->getContainer()->get('test.service_container');`
`99`	`95`	`} catch (ServiceNotFoundException $e) {`
`100`	`96`	`throw new \LogicException('Could not find service "test.service_container". Try updating the "framework.test" config to "true".', 0, $e);`
`101`	`97`	`}`
`@@ -144,14 +140,9 @@ protected static function createKernel(array $options = []): KernelInterface`
`144`	`140`	`protected static function ensureKernelShutdown()`
`145`	`141`	`{`
`146`	`142`	`if (null !== static::$kernel) {`
	`143`	`+ static::$kernel->boot();`
`147`	`144`	`static::$kernel->shutdown();`
`148`	`145`	`static::$booted = false;`
`149`	`146`	`}`
`150`		`-`
`151`		`- if (self::$kernelContainer instanceof ResetInterface) {`
`152`		`- self::$kernelContainer->reset();`
`153`		`- }`
`154`		`-`
`155`		`- self::$kernelContainer = null;`
`156`	`147`	`}`
`157`	`148`	`}`