#31783: Updated laminas-mvc

Author: sivaschenko

composer.json

@@ -53,7 +53,7 @@
         "laminas/laminas-mail": "^2.9.0",
         "laminas/laminas-mime": "^2.5.0",
         "laminas/laminas-modulemanager": "^2.7",
-        "laminas/laminas-mvc": "~2.7.0",
+        "laminas/laminas-mvc": "^3.2.0",
         "laminas/laminas-serializer": "^2.7.2",
         "laminas/laminas-server": "^2.6.1",
         "laminas/laminas-servicemanager": "^3.6.0",

composer.lock

@@ -5,13 +5,13 @@
  */
 
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
-use Laminas\Mvc\Service\DiAbstractServiceFactoryFactory;
-use Laminas\ServiceManager\Di\DiAbstractServiceFactory;
+use Laminas\Di\ConfigInterface;
+use Laminas\Di\InjectorInterface;
+use Laminas\Di\Container\ConfigFactory;
+use Laminas\Di\Container\InjectorFactory;
 
 return [
-    'modules' => [
-        'Magento\Setup',
-    ],
+    'modules' => require __DIR__ . '/modules.config.php',
     'module_listener_options' => [
         'module_paths' => [
             __DIR__ . '/../src',
@@ -25,12 +25,9 @@
     ],
     'service_manager' => [
         'factories' => [
-            DiAbstractServiceFactory::class => DiAbstractServiceFactoryFactory::class,
-            InitParamListener::BOOTSTRAP_PARAM => InitParamListener::class,
+//            ConfigInterface::class => ConfigFactory::class,
+//            InjectorInterface::class => InjectorFactory::class,
+            InitParamListener::BOOTSTRAP_PARAM => InitParamListener::class
         ],
-    ],
-    // list of Magento specific required services, like default abstract factory
-    'required_services' => [
-        DiAbstractServiceFactory::class
     ]
 ];

setup/config/application.config.php

@@ -17,24 +17,26 @@
 use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
 
 return [
-    'di' => [
-        'instance' => [
-            'preference' => [
+    'dependencies' => [
+        'auto' => [
+            'preferences' => [
                 EventManagerInterface::class => 'EventManager',
                 ServiceLocatorInterface::class => ServiceManager::class,
                 LoggerInterface::class => Quiet::class,
                 ConfigInterface::class => Config::class,
                 DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
                 ComponentRegistrarInterface::class => ComponentRegistrar::class,
             ],
-            SchemaConfig::class => [
-                'parameters' => [
-                    'connectionScopes' => [
-                        'default',
-                        'checkout',
-                        'sales'
+            'types' => [
+                SchemaConfig::class => [
+                    'parameters' => [
+                        'connectionScopes' => [
+                            'default',
+                            'checkout',
+                            'sales'
+                        ]
                     ]
-                ]
+                ],
             ],
         ],
     ],

setup/config/di.config.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-mvc-skeleton for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-mvc-skeleton/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-mvc-skeleton/blob/master/LICENSE.md New BSD License
+ */
+
+/**
+ * List of enabled modules for this application.
+ *
+ * This should be an array of module namespaces used in the application.
+ */
+return [
+    'Magento\Setup',
+    'Laminas\Db',
+    'Laminas\Di',
+    'Laminas\Form',
+    'Laminas\Filter',
+    'Laminas\Hydrator',
+    'Laminas\I18n',
+    'Laminas\InputFilter',
+    'Laminas\Log',
+    'Laminas\Mail',
+    'Laminas\Router',
+    'Laminas\Serializer',
+    'Laminas\Session',
+    'Laminas\Validator',
+];

setup/config/modules.config.php

@@ -43,7 +43,6 @@ public function bootstrap(array $configuration)
 
         $listeners = $this->getListeners($serviceManager, $configuration);
         $application = new LaminasApplication(
-            $configuration,
             $serviceManager,
             $serviceManager->get('EventManager'),
             $serviceManager->get('Request'),

setup/src/Magento/Setup/Application.php

@@ -112,7 +112,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        return $this->extractInitParameters($container->get($requestedName));
+        return $this->extractInitParameters($container->get('Application'));
     }
 
     /**