Merge pull request #1071 from oat-sa/feat/REL-1275/container-rebuild-…

…and-restart feat: rebuild and restart DI container in same request
oat-sa · Oct 10, 2023 · a33ab5d · a33ab5d
2 parents 8a93fd3 + d7b2a73
commit a33ab5d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/common/oatbox/service/ServiceManager.php b/common/oatbox/service/ServiceManager.php
@@ -265,6 +265,12 @@ public function getContainer(): ContainerInterface
         return $this->getContainerStarter()->getContainer();
     }
 
+    public function rebuildContainer(): void
+    {
+        $this->getContainerStarter()->getContainerBuilder()->forceBuild();
+        $this->containerStarter = null;
+    }
+
     /**
      * @TODO ContainerBuilder will be removed from here as soon as we do not need ServiceManager anymore.
      */

diff --git a/scripts/tools/ContainerCacheWarmup.php b/scripts/tools/ContainerCacheWarmup.php
@@ -49,7 +49,7 @@ protected function provideDescription(): string
 
     protected function run(): Report
     {
-        $this->getServiceManager()->getContainerBuilder()->forceBuild();
+        $this->getServiceManager()->rebuildContainer();
 
         return Report::createSuccess('Dependency Injection Container cache warmed up!');
     }