Merge pull request #3901 from oat-sa/feat/REL-1275/rebuild-di-container

feat: use new container rebuild function that restarts as well
oat-sa · Oct 10, 2023 · 86fb138 · 86fb138
2 parents e5a114a + 602321c
commit 86fb138
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 14 deletions.
diff --git a/actions/class.ExtensionsManager.php b/actions/class.ExtensionsManager.php
@@ -244,8 +244,6 @@ protected function getExtensionManager()
 
     private function forceRebuildDependencyInjectionContainer(): void
     {
-        $this->getServiceManager()
-            ->getContainerBuilder()
-            ->forceBuild();
+        $this->getServiceManager()->rebuildContainer();
     }
 }
diff --git a/composer.json b/composer.json
@@ -67,7 +67,7 @@
         "oat-sa/jig": "~0.2",
         "oat-sa/composer-npm-bridge": "~0.4.2||dev-master",
         "oat-sa/oatbox-extension-installer": "~1.1||dev-master",
-        "oat-sa/generis": ">=15.25",
+        "oat-sa/generis": ">=15.29",
         "composer/package-versions-deprecated": "^1.11",
         "paragonie/random_compat": "^2.0",
         "phpdocumentor/reflection-docblock": "^5.2",

diff --git a/install/class.Installator.php b/install/class.Installator.php
@@ -615,8 +615,6 @@ private function setInstallationFinished()
 
     private function recreateDependencyInjectionContainerCache(): void
     {
-        ServiceManager::getServiceManager()
-            ->getContainerBuilder()
-            ->forceBuild();
+        ServiceManager::getServiceManager()->rebuildContainer();
     }
 }
diff --git a/scripts/installExtension.php b/scripts/installExtension.php
@@ -35,6 +35,4 @@
 
 InstallHelper::installRecursively([$extId]);
 
-ServiceManager::getServiceManager()
-    ->getContainerBuilder()
-    ->forceBuild();
+ServiceManager::getServiceManager()->rebuildContainer();
diff --git a/scripts/taoUpdate.php b/scripts/taoUpdate.php
@@ -34,7 +34,7 @@
 $action->setServiceLocator($serviceManager);
 $report = $action->__invoke([]);
 
-$serviceManager->getContainerBuilder()->forceBuild();
+$serviceManager->rebuildContainer();
 
 /** @var FeatureFlagRepositoryInterface $featureFlagChecker */
 $featureFlagChecker = $serviceManager->getContainer()->get(FeatureFlagRepositoryInterface::class);

diff --git a/scripts/uninstallExtension.php b/scripts/uninstallExtension.php
@@ -41,8 +41,7 @@
     $uninstaller = new tao_install_ExtensionUninstaller($extension);
     $uninstaller->uninstall();
 
-    $serviceManager->getContainerBuilder()
-        ->forceBuild();
+    $serviceManager->rebuildContainer();
 
     $message = __('Uninstalled %s', $extId);
 } catch (common_Exception $e) {

diff --git a/scripts/update/MigrateWebhooksConfigsFromFileToRdf.php b/scripts/update/MigrateWebhooksConfigsFromFileToRdf.php
@@ -40,7 +40,7 @@ public function __invoke($params): Report
         OntologyUpdater::syncModels();
 
         $serviceManager = $this->getServiceManager();
-        $serviceManager->getContainerBuilder()->forceBuild();
+        $serviceManager->rebuildContainer();
 
         try {
             /** @var WebhookFileRegistry $fileRegistry */