AC-15068::Laminas MVC Retiring

Author: Dnyaneshwar S Jambhulkar

lib/internal/Magento/Framework/Setup/Native/ModuleManager.php renamed to lib/internal/Magento/Framework/Setup/Mvc/ModuleManager.php

@@ -1,10 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
+declare(strict_types=1);
 
-namespace Magento\Framework\Setup\Native;
+namespace Magento\Framework\Setup\Mvc;
+
+use Laminas\EventManager\EventManagerInterface;
 
 /**
  * Native ModuleManager that provides minimal module loading functionality for setup application
@@ -14,20 +17,20 @@ class ModuleManager
     /**
      * @var array
      */
-    private $modules;
+    private array $modules;
 
     /**
-     * @var \Laminas\EventManager\EventManagerInterface
+     * @var EventManagerInterface
      */
-    private $eventManager;
+    private EventManagerInterface $eventManager;
 
     /**
      * Constructor
      *
      * @param array $modules
-     * @param \Laminas\EventManager\EventManagerInterface $eventManager
+     * @param EventManagerInterface $eventManager
      */
-    public function __construct(array $modules, \Laminas\EventManager\EventManagerInterface $eventManager)
+    public function __construct(array $modules, EventManagerInterface $eventManager)
     {
         $this->modules = $modules;
         $this->eventManager = $eventManager;
@@ -38,16 +41,16 @@ public function __construct(array $modules, \Laminas\EventManager\EventManagerIn
      *
      * @return void
      */
-    public function loadModules()
+    public function loadModules(): void
     {
         $config = [];
-        
+
         // Load configuration from each module
         foreach ($this->modules as $moduleName) {
             if (class_exists($moduleName . '\Module')) {
                 $moduleClass = $moduleName . '\Module';
                 $moduleInstance = new $moduleClass();
-                
+
                 if (method_exists($moduleInstance, 'getConfig')) {
                     $moduleConfig = $moduleInstance->getConfig();
                     if (is_array($moduleConfig)) {
@@ -56,7 +59,7 @@ public function loadModules()
                 }
             }
         }
-        
+
         // Trigger event to allow modules to be loaded
         $this->eventManager->trigger('loadModules.post', $this, ['config' => $config]);
     }

lib/internal/Magento/Framework/Setup/Native/ModuleManagerFactory.php renamed to lib/internal/Magento/Framework/Setup/Mvc/ModuleManagerFactory.php

@@ -1,10 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
+declare(strict_types=1);
 
-namespace Magento\Framework\Setup\Native;
+namespace Magento\Framework\Setup\Mvc;
 
 /**
  * Native ModuleManagerFactory that creates ModuleManager for setup application
@@ -19,10 +20,10 @@ class ModuleManagerFactory
      * @param array|null $options
      * @return ModuleManager
      */
-    public function __invoke($container, $name, ?array $options = null)
+    public function __invoke(mixed $container, string $name, ?array $options = null): ModuleManager
     {
         $configuration = $container->get('ApplicationConfig');
-        $modules = isset($configuration['modules']) ? $configuration['modules'] : [];
+        $modules = $configuration['modules'] ?? [];
         $eventManager = $container->get('EventManager');
 
         return new ModuleManager($modules, $eventManager);

lib/internal/Magento/Framework/Setup/Native/MvcApplication.php renamed to lib/internal/Magento/Framework/Setup/Mvc/MvcApplication.php

@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
+declare(strict_types=1);
 
-namespace Magento\Framework\Setup\Native;
+namespace Magento\Framework\Setup\Mvc;
 
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\EventManager\EventManagerInterface;
 use Laminas\Stdlib\ArrayUtils;
-use Magento\Framework\Setup\ServiceManagerFactory;
 
 /**
  * Native MVC Application that replicates Laminas\Mvc\Application functionality
@@ -20,43 +20,56 @@ class MvcApplication
     /**
      * @var ServiceManager
      */
-    private $serviceManager;
+    private ServiceManager $serviceManager;
 
     /**
      * Constructor (compatible with Laminas\Mvc\Application)
      *
      * @param ServiceManager $serviceManager
-     * @param mixed $eventManager
-     * @param mixed $request
-     * @param mixed $response
      */
     public function __construct(
-        ServiceManager $serviceManager,
-        $eventManager = null,
-        $request = null,
-        $response = null
+        ServiceManager $serviceManager
     ) {
         $this->serviceManager = $serviceManager;
-        // For setup commands, we don't need eventManager, request, response
     }
 
     /**
      * Get service manager (same API as Laminas\Mvc\Application)
      *
      * @return ServiceManager
      */
-    public function getServiceManager()
+    public function getServiceManager(): ServiceManager
     {
         return $this->serviceManager;
     }
 
+    /**
+     * Get event manager (compatibility method for tests)
+     *
+     * @return EventManagerInterface
+     */
+    public function getEventManager(): EventManagerInterface
+    {
+        return $this->serviceManager->get('EventManager');
+    }
+
+    /**
+     * Get configuration (compatibility method for tests)
+     *
+     * @return array
+     */
+    public function getConfig(): array
+    {
+        return $this->serviceManager->get('config');
+    }
+
     /**
      * Bootstrap the application (same API as Laminas\Mvc\Application)
      *
      * @param array $listeners
      * @return self
      */
-    public function bootstrap(array $listeners = [])
+    public function bootstrap(array $listeners = []): static
     {
         // Bootstrap listeners for setup
         foreach ($listeners as $listener) {
@@ -80,19 +93,19 @@ public function bootstrap(array $listeners = [])
      * @param array $configuration
      * @return self
      */
-    public static function init(array $configuration)
+    public static function init(array $configuration): MvcApplication
     {
         // Pre-load module configurations to get their service_manager configs
         $moduleConfigs = self::loadModuleConfigurations($configuration);
-        
+
         // Merge application service_manager config with module service_manager configs
-        $serviceManagerConfig = isset($configuration['service_manager']) ? $configuration['service_manager'] : [];
+        $serviceManagerConfig = $configuration['service_manager'] ?? [];
         foreach ($moduleConfigs as $moduleConfig) {
             if (isset($moduleConfig['service_manager'])) {
                 $serviceManagerConfig = ArrayUtils::merge($serviceManagerConfig, $moduleConfig['service_manager']);
             }
         }
-        
+
         $smConfig = new MvcServiceManagerConfig($serviceManagerConfig);
 
         $serviceManager = new ServiceManager();
@@ -118,17 +131,17 @@ public static function init(array $configuration)
      * @param array $configuration
      * @return array
      */
-    private static function loadModuleConfigurations(array $configuration)
+    private static function loadModuleConfigurations(array $configuration): array
     {
         $moduleConfigs = [];
-        $modules = isset($configuration['modules']) ? $configuration['modules'] : [];
-        
+        $modules = $configuration['modules'] ?? [];
+
         // Load configuration from each module
         foreach ($modules as $moduleName) {
             if (class_exists($moduleName . '\Module')) {
                 $moduleClass = $moduleName . '\Module';
                 $moduleInstance = new $moduleClass();
-                
+
                 if (method_exists($moduleInstance, 'getConfig')) {
                     $moduleConfig = $moduleInstance->getConfig();
                     if (is_array($moduleConfig)) {
@@ -137,7 +150,7 @@ private static function loadModuleConfigurations(array $configuration)
                 }
             }
         }
-        
+
         return $moduleConfigs;
     }
 
@@ -147,10 +160,10 @@ private static function loadModuleConfigurations(array $configuration)
      * @param ServiceManager $serviceManager
      * @param array $configuration
      */
-    private static function loadAutoloadConfig(ServiceManager $serviceManager, array $configuration)
+    private static function loadAutoloadConfig(ServiceManager $serviceManager, array $configuration): void
     {
         $mergedConfig = $configuration;
-        
+
         // Load global.php and local.php configurations from config_glob_paths
         if (isset($configuration['module_listener_options']['config_glob_paths'])) {
             foreach ($configuration['module_listener_options']['config_glob_paths'] as $globPath) {
@@ -172,7 +185,7 @@ private static function loadAutoloadConfig(ServiceManager $serviceManager, array
             $moduleConfig = $module->getConfig();
             $mergedConfig = array_merge_recursive($mergedConfig, $moduleConfig);
         }
-        
+
         $serviceManager->setService('config', $mergedConfig);
     }
 }

lib/internal/Magento/Framework/Setup/Mvc/MvcEvent.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Mvc;
+
+/**
+ * Native MvcEvent class that provides minimal compatibility with Laminas MvcEvent
+ * for Magento setup commands without requiring Laminas MVC
+ */
+class MvcEvent
+{
+    public const EVENT_BOOTSTRAP = 'bootstrap';
+    /**
+     * @var MvcApplication
+     */
+    private MvcApplication $application;
+
+    /**
+     * Set application
+     *
+     * @param MvcApplication $application
+     * @return void
+     */
+    public function setApplication(MvcApplication $application): void
+    {
+        $this->application = $application;
+    }
+
+    /**
+     * Get application
+     *
+     * @return MvcApplication
+     */
+    public function getApplication(): MvcApplication
+    {
+        return $this->application;
+    }
+}

lib/internal/Magento/Framework/Setup/Native/MvcServiceManagerConfig.php renamed to lib/internal/Magento/Framework/Setup/Mvc/MvcServiceManagerConfig.php

@@ -1,10 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
+declare(strict_types=1);
 
-namespace Magento\Framework\Setup\Native;
+namespace Magento\Framework\Setup\Mvc;
 
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\EventManager\EventManager;
@@ -23,7 +24,7 @@ class MvcServiceManagerConfig
     /**
      * @var array
      */
-    protected $config;
+    protected array $config;
 
     /**
      * Constructor
@@ -102,17 +103,17 @@ public function __construct(array $config = [])
      * @param ServiceManager $serviceManager
      * @return ServiceManager
      */
-    public function configureServiceManager(ServiceManager $serviceManager)
+    public function configureServiceManager(ServiceManager $serviceManager): ServiceManager
     {
         // Add ServiceManager service reference (same as Laminas)
         $this->config['services'][ServiceManager::class] = $serviceManager;
 
         // Enable override during bootstrapping (same as Laminas)
         $serviceManager->setAllowOverride(true);
-        
+
         // Configure the service manager using Laminas ServiceManager's native configure method
         $serviceManager->configure($this->config);
-        
+
         // Disable override after configuration (same as Laminas)
         $serviceManager->setAllowOverride(false);
 
@@ -124,7 +125,7 @@ public function configureServiceManager(ServiceManager $serviceManager)
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         return $this->config;
     }

lib/internal/Magento/Framework/Setup/Mvc/ServiceListenerFactory.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Setup\Mvc;
+use Laminas\ModuleManager\Listener\ServiceListener;
+use Laminas\ServiceManager\ServiceManager;
+
+/**
+ * Native ServiceListenerFactory that provides minimal ServiceListener for setup application
+ */
+class ServiceListenerFactory
+{
+    /**
+     * Create ServiceListener instance (minimal implementation for setup)
+     *
+     * @param ServiceManager $container
+     * @param string $name
+     * @param array|null $options
+     * @return ServiceListener
+     */
+    public function __invoke(ServiceManager $container, string $name, ?array $options = null): ServiceListener
+    {
+        return new ServiceListener($container);
+    }
+}