enabled bootstrapping of MVC Application

optional via $appConfig['laminas-cli']['bootstrap_mvc_application']
laminas · Mar 9, 2023 · a74c954 · a74c954
1 parent 97930db
commit a74c954
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/src/ContainerResolver.php b/src/ContainerResolver.php
@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use Laminas\ModuleManager\ModuleManagerInterface;
+use Laminas\Mvc\Application;
 use Laminas\Mvc\Service\ServiceManagerConfig;
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\Stdlib\ArrayUtils;
@@ -98,18 +99,31 @@ private function resolveMvcContainer(string $path): ContainerInterface
             Assert::isMap($appConfig);
         }
 
-        $servicesConfig = $appConfig['service_manager'] ?? [];
-        Assert::isMap($servicesConfig);
+        Assert::classExists(Application::class);
 
-        $smConfig = new ServiceManagerConfig($servicesConfig);
+        if ($appConfig['laminas-cli']['bootstrap_mvc_application'] ?? false) {
+            // initialize & bootstrap MVC Application
+            $mvcApplication = Application::init($appConfig);
+            $serviceManager = $mvcApplication->getServiceManager();
+        } else {
+            /* @deprecated MVC Application is not bootstrapped */
+            trigger_error('Running laminas-cli in MVC Environment without bootstrapping ' .
+                'the MVC Application is deprecated. ' .
+                '@see https://github.com/laminas/laminas-cli/issues/106', E_USER_DEPRECATED);
 
-        $serviceManager = new ServiceManager();
-        $smConfig->configureServiceManager($serviceManager);
-        $serviceManager->setService('ApplicationConfig', $appConfig);
+            $servicesConfig = $appConfig['service_manager'] ?? [];
+            Assert::isMap($servicesConfig);
 
-        $moduleManager = $serviceManager->get('ModuleManager');
-        Assert::isInstanceOf($moduleManager, ModuleManagerInterface::class);
-        $moduleManager->loadModules();
+            $smConfig = new ServiceManagerConfig($servicesConfig);
+
+            $serviceManager = new ServiceManager();
+            $smConfig->configureServiceManager($serviceManager);
+            $serviceManager->setService('ApplicationConfig', $appConfig);
+
+            $moduleManager = $serviceManager->get('ModuleManager');
+            Assert::isInstanceOf($moduleManager, ModuleManagerInterface::class);
+            $moduleManager->loadModules();
+        }
 
         return $serviceManager;
     }