#31854: Removed optional parameters types from classes instantiated by laminas di

Author: sivaschenko

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

@@ -72,7 +72,7 @@ class InputValidator
      */
     public function __construct(
         Locale $localeValidator,
-        ?RegexFactory $versionValidatorFactory = null
+        $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 $indexerRegistry = null,
-        DependencyInfoProvider $dependencyInfoProvider = null,
-        MakeSharedIndexValid $makeSharedValid = null
+        $indexerRegistry = null,
+        $dependencyInfoProvider = null,
+        $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 $commentParser = null
+        $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, ?Manager $eventManager = null)
+    public function __construct(Filesystem $filesystem, $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 $state = null
+        $state = null
     ) {
         $this->filesystem = $filesystem;
         $this->directoryList = $directoryList;

lib/internal/Magento/Framework/composer.json

@@ -30,7 +30,7 @@
         "laminas/laminas-http": "^2.6.0",
         "laminas/laminas-mail": "^2.9.0",
         "laminas/laminas-mime": "^2.5.0",
-        "laminas/laminas-mvc": "~2.7.0",
+        "laminas/laminas-mvc": "^3.2.0",
         "laminas/laminas-stdlib": "^3.2.1",
         "laminas/laminas-uri": "^2.5.1",
         "laminas/laminas-validator": "^2.6.0",

setup/config/modules.config.php

@@ -1,11 +1,8 @@
 <?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
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
-
 /**
  * List of enabled modules for this application.
  *

setup/src/Magento/Setup/Application.php

@@ -5,11 +5,9 @@
  */
 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
@@ -37,7 +35,6 @@ 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/Console/Command/BackupCommand.php

@@ -60,17 +60,15 @@ 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 $maintenanceModeEnabler = null
+        $maintenanceModeEnabler = null
     ) {
         $this->objectManager = $objectManagerProvider->get();
         $this->backupRollbackFactory = $this->objectManager->get(\Magento\Framework\Setup\BackupRollbackFactory::class);
@@ -155,7 +153,7 @@ function () use ($input, $output) {
             $output,
             false
         );
-        
+
         return $returnValue;
     }
 

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

@@ -99,7 +99,7 @@ public function __construct(
         Filesystem $filesystem,
         DriverInterface $fileDriver,
         ComponentRegistrar $componentRegistrar,
-        File $file = null
+        $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,
-        TableFactory $tableHelperFactory = null
+        $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, TableFactory $tableHelperFactory = null)
+    public function __construct(Lists $lists, $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, TableFactory $tableHelperFactory = null)
+    public function __construct(Lists $lists, $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, TableFactory $tableHelperFactory = null)
+    public function __construct(Lists $lists, $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 $maintenanceModeEnabler = null
+        $maintenanceModeEnabler = null
     ) {
         parent::__construct($objectManagerProvider);
         $this->composer = $composer;

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

@@ -59,17 +59,15 @@ 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 $maintenanceModeEnabler = null
+        $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 $deploymentConfig = null,
-        AppState $appState = null,
-        CacheInterface $cache = null
+        $deploymentConfig = null,
+        $appState = null,
+        $cache = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;

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

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

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

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