Revert Cleanup CachedContainer invalidation (#3867) (#3880)

This reverts commit f0141af.
rectorphp · May 17, 2023 · 5e3afcb · 5e3afcb
1 parent c018b8b
commit 5e3afcb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 78 deletions.
diff --git a/packages/Testing/PHPUnit/AbstractTestCase.php b/packages/Testing/PHPUnit/AbstractTestCase.php
@@ -60,7 +60,15 @@ protected function getService(string $type): object
             );
         }
 
-        $object = self::$currentContainer->get($type);
+        try {
+            $object = self::$currentContainer->get($type);
+        } catch (Throwable $throwable) {
+            // clear compiled container cache, to trigger re-discovery
+            RectorKernel::clearCache();
+
+            throw $throwable;
+        }
+
         if ($object === null) {
             $message = sprintf('Service "%s" was not found', $type);
             throw new ShouldNotHappenException($message);

diff --git a/src/Exception/Cache/StaleContainerCacheException.php b/src/Exception/Cache/StaleContainerCacheException.php
diff --git a/src/Kernel/CacheInvalidatingContainer.php b/src/Kernel/CacheInvalidatingContainer.php
diff --git a/src/Kernel/CachedContainerBuilder.php b/src/Kernel/CachedContainerBuilder.php
@@ -37,11 +37,10 @@ public function build(array $configFiles, string $hash, callable $containerBuild
         if (file_exists($file)) {
             require_once $file;
             $className = '\\' . __NAMESPACE__ . '\\' . $className;
-            $cachedContainer = new $className();
-            if (! $cachedContainer instanceof ContainerInterface) {
+            $container = new $className();
+            if (! $container instanceof ContainerInterface) {
                 throw new ShouldNotHappenException();
             }
-            $container = new CacheInvalidatingContainer($cachedContainer);
         } else {
             $container = ($containerBuilderCallback)($configFiles);