#31854: Customized laminas-di to resolve only required constructor parameters

Author: sivaschenko

setup/config/application.config.php

@@ -4,11 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Setup\Mvc\Bootstrap\InitParamListener;
-use Laminas\Di\ConfigInterface;
 use Laminas\Di\InjectorInterface;
-use Laminas\Di\Container\ConfigFactory;
-use Laminas\Di\Container\InjectorFactory;
+use Magento\Setup\Mvc\Bootstrap\InitParamListener;
 
 return [
     'modules' => require __DIR__ . '/modules.config.php',
@@ -25,9 +22,7 @@
     ],
     'service_manager' => [
         'factories' => [
-//            ConfigInterface::class => ConfigFactory::class,
-//            InjectorInterface::class => InjectorFactory::class,
-            InitParamListener::BOOTSTRAP_PARAM => InitParamListener::class
+            InitParamListener::BOOTSTRAP_PARAM => InitParamListener::class,
         ],
     ]
 ];

setup/src/Magento/Setup/Application.php

@@ -5,9 +5,11 @@
  */
 namespace Magento\Setup;
 
+use Laminas\Di\InjectorInterface;
 use Laminas\Mvc\Application as LaminasApplication;
 use Laminas\Mvc\Service\ServiceManagerConfig;
 use Laminas\ServiceManager\ServiceManager;
+use Magento\Setup\Di\InjectorFactory;
 
 /**
  * This class is wrapper on \Laminas\Mvc\Application
@@ -35,6 +37,7 @@ public function bootstrap(array $configuration)
         $serviceManager->setService('ApplicationConfig', $configuration);
 
         $serviceManager->get('ModuleManager')->loadModules();
+        $serviceManager->setFactory(InjectorInterface::class, InjectorFactory::class);
 
         // load specific services
         if (!empty($configuration['required_services'])) {

setup/src/Magento/Setup/Di/DependencyResolver.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Di;
+
+use Laminas\Di\Definition\ClassDefinitionInterface;
+use Laminas\Di\Resolver\DependencyResolver as LaminasDependencyResolver;
+
+/**
+ * Dependency resolver fulfilling required constructor parameters only
+ */
+class DependencyResolver extends LaminasDependencyResolver
+{
+    /**
+     * @inheritDoc
+     */
+    private function getClassDefinition(string $type): ClassDefinitionInterface
+    {
+        if ($this->config->isAlias($type)) {
+            $type = $this->config->getClassForAlias($type) ?? $type;
+        }
+
+        return $this->definition->getClassDefinition($type);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolveParameters(string $requestedType, array $callTimeParameters = []): array
+    {
+        $result = parent::resolveParameters($requestedType, $callTimeParameters);
+        if (empty($result)) {
+            return [];
+        }
+
+        $parameters = $this->getClassDefinition($requestedType)->getParameters();
+        $requiredOnlyResult = [];
+
+        foreach ($parameters as $paramInfo) {
+            if (!$paramInfo->isRequired()) {
+                continue;
+            }
+            $name = $paramInfo->getName();
+            $requiredOnlyResult[$name] = $result[$name];
+        }
+
+        return $requiredOnlyResult;
+    }
+}

setup/src/Magento/Setup/Di/InjectorFactory.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Di;
+
+use Laminas\Di\ConfigInterface;
+use Laminas\Di\Definition\RuntimeDefinition;
+use Laminas\Di\Injector;
+use Laminas\Di\InjectorInterface;
+use Psr\Container\ContainerInterface;
+use Zend\Di\ConfigInterface as LegacyConfigInterace;
+use Laminas\Di\Container\ConfigFactory;
+
+/**
+ * Implements the DependencyInjector service factory for laminas-servicemanager
+ */
+class InjectorFactory
+{
+    private function createConfig(ContainerInterface $container): ConfigInterface
+    {
+        if ($container->has(ConfigInterface::class)) {
+            return $container->get(ConfigInterface::class);
+        }
+
+        if ($container->has(LegacyConfigInterace::class)) {
+            return $container->get(LegacyConfigInterace::class);
+        }
+
+        return (new ConfigFactory())->create($container);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function create(ContainerInterface $container): InjectorInterface
+    {
+        $config = $this->createConfig($container);
+        $definition = new RuntimeDefinition();
+        return new Injector(
+            $config,
+            $container,
+            $definition,
+            new DependencyResolver($definition, $config)
+        );
+    }
+
+    /**
+     * Make the instance invokable
+     */
+    public function __invoke(ContainerInterface $container): InjectorInterface
+    {
+        return $this->create($container);
+    }
+}