fix: compatibility with symfony 5.x and phpunit kernel test case

ongr-io · Mar 15, 2023 · afe3e49 · afe3e49
1 parent fab7e37
commit afe3e49
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Test/AbstractElasticsearchTestCase.php b/Test/AbstractElasticsearchTestCase.php
@@ -72,7 +72,7 @@ private function populateElastic(IndexService $indexService, array $documents =
     protected function tearDown(): void
     {
         parent::tearDown();
-
+        self::$cachedContainer = null;
         foreach ($this->indexes as $name => $index) {
             try {
                 $index->dropIndex();
@@ -84,9 +84,12 @@ protected function tearDown(): void
 
     protected static function getContainer($reinitialize = false, $kernelOptions = []): ContainerInterface
     {
-        if (!self::$cachedContainer && !$reinitialize) {
-//            static::bootKernel($kernelOptions);
+        if ($reinitialize && self::$booted) {
+            self::ensureKernelShutdown();
+            self::$cachedContainer = null;
+        }
 
+        if (!self::$cachedContainer) {
             self::$cachedContainer = static::createClient(['environment' => 'test'])->getContainer();
         }