#31854: Utilized Magento DI for loading types Laminas DI cannot handle

Author: sivaschenko

app/code/Magento/Deploy/Console/InputValidator.php

@@ -72,7 +72,7 @@ class InputValidator
      */
     public function __construct(
         Locale $localeValidator,
-        $versionValidatorFactory = null
+        ?RegexFactory $versionValidatorFactory = null
     ) {
         $this->localeValidator = $localeValidator;
         $this->versionValidatorFactory = $versionValidatorFactory ?:

app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php

@@ -58,9 +58,9 @@ class IndexerReindexCommand extends AbstractIndexerManageCommand
      */
     public function __construct(
         ObjectManagerFactory $objectManagerFactory,
-        $indexerRegistry = null,
-        $dependencyInfoProvider = null,
-        $makeSharedValid = null
+        IndexerRegistry $indexerRegistry = null,
+        DependencyInfoProvider $dependencyInfoProvider = null,
+        MakeSharedIndexValid $makeSharedValid = null
     ) {
         $this->indexerRegistry = $indexerRegistry;
         $this->dependencyInfoProvider = $dependencyInfoProvider;

lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php

@@ -71,7 +71,7 @@ public function __construct(
         ConfigFilePool $configFilePool,
         DeploymentConfig $deploymentConfig,
         Writer\FormatterInterface $formatter = null,
-        $commentParser = null
+        CommentParser $commentParser = null
     ) {
         $this->reader = $reader;
         $this->filesystem = $filesystem;

lib/internal/Magento/Framework/App/MaintenanceMode.php

@@ -48,7 +48,7 @@ class MaintenanceMode
      * @param \Magento\Framework\Filesystem $filesystem
      * @param Manager|null $eventManager
      */
-    public function __construct(Filesystem $filesystem, $eventManager = null)
+    public function __construct(Filesystem $filesystem, ?Manager $eventManager = null)
     {
         $this->flagDir = $filesystem->getDirectoryWrite(self::FLAG_DIR);
         $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(Manager::class);

lib/internal/Magento/Framework/Setup/FilePermissions.php

@@ -75,7 +75,7 @@ class FilePermissions
     public function __construct(
         Filesystem $filesystem,
         DirectoryList $directoryList,
-        $state = null
+        State $state = null
     ) {
         $this->filesystem = $filesystem;
         $this->directoryList = $directoryList;

setup/config/application.config.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-use Laminas\Di\InjectorInterface;
+use Magento\Setup\Di\MagentoDiFactory;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
 
 return [
@@ -23,6 +23,12 @@
     'service_manager' => [
         'factories' => [
             InitParamListener::BOOTSTRAP_PARAM => InitParamListener::class,
+            \Magento\Framework\App\MaintenanceMode::class => MagentoDiFactory::class,
+            \Magento\Setup\Model\ConfigGenerator::class => MagentoDiFactory::class,
+            \Magento\Indexer\Console\Command\IndexerReindexCommand::class => MagentoDiFactory::class,
+            \Symfony\Component\Console\Helper\TableFactory::class => MagentoDiFactory::class,
+            \Magento\Deploy\Console\InputValidator::class => MagentoDiFactory::class,
+            \Magento\Framework\App\State::class => MagentoDiFactory::class,
         ],
     ]
 ];

setup/src/Magento/Setup/Console/Command/BackupCommand.php

@@ -60,15 +60,17 @@ class BackupCommand extends AbstractSetupCommand
      * Constructor
      *
      * @param ObjectManagerProvider $objectManagerProvider
+     * @param MaintenanceMode $maintenanceMode deprecated, use $maintenanceModeEnabler instead
      * @param DeploymentConfig $deploymentConfig
      * @param MaintenanceModeEnabler $maintenanceModeEnabler
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
+        MaintenanceMode $maintenanceMode,
         DeploymentConfig $deploymentConfig,
-        $maintenanceModeEnabler = null
+        MaintenanceModeEnabler $maintenanceModeEnabler = null
     ) {
         $this->objectManager = $objectManagerProvider->get();
         $this->backupRollbackFactory = $this->objectManager->get(\Magento\Framework\Setup\BackupRollbackFactory::class);

setup/src/Magento/Setup/Console/Command/DiCompileCommand.php

@@ -99,7 +99,7 @@ public function __construct(
         Filesystem $filesystem,
         DriverInterface $fileDriver,
         ComponentRegistrar $componentRegistrar,
-        $file = null
+        File $file = null
     ) {
         $this->deploymentConfig = $deploymentConfig;
         $this->directoryList    = $directoryList;

setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php

@@ -48,7 +48,7 @@ class InfoBackupsListCommand extends Command
     public function __construct(
         DirectoryList $directoryList,
         File $file,
-        $tableHelperFactory = null
+        TableFactory $tableHelperFactory = null
     ) {
         $this->directoryList = $directoryList;
         $this->file = $file;

setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php

@@ -34,7 +34,7 @@ class InfoCurrencyListCommand extends Command
      * @param Lists $lists
      * @param TableFactory $tableHelperFactory
      */
-    public function __construct(Lists $lists, $tableHelperFactory = null)
+    public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
     {
         $this->lists = $lists;
         $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);

setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php

@@ -34,7 +34,7 @@ class InfoLanguageListCommand extends Command
      * @param Lists $lists
      * @param TableFactory $tableHelperFactory
      */
-    public function __construct(Lists $lists, $tableHelperFactory = null)
+    public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
     {
         $this->lists = $lists;
         $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);

setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php

@@ -34,7 +34,7 @@ class InfoTimezoneListCommand extends Command
      * @param Lists $lists
      * @param TableFactory $tableHelperFactory
      */
-    public function __construct(Lists $lists, $tableHelperFactory = null)
+    public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
     {
         $this->lists = $lists;
         $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);

setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php

@@ -139,7 +139,7 @@ public function __construct(
         UninstallCollector $collector,
         ModuleUninstaller $moduleUninstaller,
         ModuleRegistryUninstaller $moduleRegistryUninstaller,
-        $maintenanceModeEnabler = null
+        MaintenanceModeEnabler $maintenanceModeEnabler = null
     ) {
         parent::__construct($objectManagerProvider);
         $this->composer = $composer;

setup/src/Magento/Setup/Console/Command/RollbackCommand.php

@@ -59,15 +59,17 @@ class RollbackCommand extends AbstractSetupCommand
      * Constructor
      *
      * @param ObjectManagerProvider $objectManagerProvider
+     * @param MaintenanceMode $maintenanceMode deprecated, use $maintenanceModeEnabler instead
      * @param DeploymentConfig $deploymentConfig
      * @param MaintenanceModeEnabler $maintenanceModeEnabler
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
+        MaintenanceMode $maintenanceMode,
         DeploymentConfig $deploymentConfig,
-        $maintenanceModeEnabler = null
+        MaintenanceModeEnabler $maintenanceModeEnabler = null
     ) {
         $this->objectManager = $objectManagerProvider->get();
         $this->backupRollbackFactory = $this->objectManager->get(\Magento\Framework\Setup\BackupRollbackFactory::class);

setup/src/Magento/Setup/Console/Command/UpgradeCommand.php

@@ -70,9 +70,9 @@ class UpgradeCommand extends AbstractSetupCommand
     public function __construct(
         InstallerFactory $installerFactory,
         SearchConfigFactory $searchConfigFactory,
-        $deploymentConfig = null,
-        $appState = null,
-        $cache = null
+        DeploymentConfig $deploymentConfig = null,
+        AppState $appState = null,
+        CacheInterface $cache = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;

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

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Di;
+
+use Interop\Container\ContainerInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Instantiates the type via Magento object manager
+ */
+class MagentoDiFactory implements FactoryInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        return ObjectManager::getInstance()->get($requestedName);
+    }
+}

setup/src/Magento/Setup/Model/ConfigGenerator.php

@@ -80,9 +80,9 @@ class ConfigGenerator
     public function __construct(
         Random $random,
         DeploymentConfig $deploymentConfig,
-        $configDataFactory = null,
-        $cryptKeyGenerator = null,
-        $driverOptions = null
+        ConfigDataFactory $configDataFactory = null,
+        CryptKeyGeneratorInterface $cryptKeyGenerator = null,
+        DriverOptions $driverOptions = null
     ) {
         $this->random = $random;
         $this->deploymentConfig = $deploymentConfig;

setup/src/Magento/Setup/Model/ConfigOptionsList.php

@@ -72,8 +72,8 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     public function __construct(
         ConfigGenerator $configGenerator,
         DbValidator $dbValidator,
-        $encryptionKeyValidator = null,
-        $driverOptions = null
+        KeyValidator $encryptionKeyValidator = null,
+        DriverOptions $driverOptions = null
     ) {
         $this->configGenerator = $configGenerator;
         $this->dbValidator = $dbValidator;