Merge branch 'php8-develop' of github.com:magento-commerce/magento2ce into updatephp8/laminas-laminas-serializer

Author: sivaschenko

composer.json

@@ -37,23 +37,21 @@
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-captcha": "^2.7.1",
         "laminas/laminas-code": "^3.5.1",
-        "laminas/laminas-console": "^2.6.0",
         "laminas/laminas-crypt": "^3.4.0",
         "laminas/laminas-db": "^2.12.0",
         "laminas/laminas-dependency-plugin": "^2.1.0",
         "laminas/laminas-di": "^3.2.0",
         "laminas/laminas-eventmanager": "^3.0.0",
-        "laminas/laminas-feed": "^2.9.0",
+        "laminas/laminas-feed": "^2.13.0",
         "laminas/laminas-form": "^2.10.0",
         "laminas/laminas-http": "^2.6.0",
         "laminas/laminas-i18n": "^2.7.3",
         "laminas/laminas-json": "^3.2.0",
-        "laminas/laminas-log": "^2.9.1",
+        "laminas/laminas-log": "^2.13",
         "laminas/laminas-mail": "^2.9.0",
         "laminas/laminas-mime": "^2.8.0",
         "laminas/laminas-modulemanager": "^2.7",
         "laminas/laminas-mvc": "^3.2.0",
-        "laminas/laminas-mvc-console": "^1.3.0",
         "laminas/laminas-serializer": "^2.10.1",
         "laminas/laminas-server": "^2.6.1",
         "laminas/laminas-servicemanager": "^3.6.0",

composer.lock

@@ -22,6 +22,5 @@
     'Laminas\Router',
     'Laminas\Serializer',
     'Laminas\Session',
-    'Laminas\Validator',
-    'Laminas\Mvc\Console'
+    'Laminas\Validator'
 ];

setup/config/modules.config.php

@@ -11,14 +11,12 @@
 use Magento\Framework\App\State;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Shell\ComplexParameter;
-use Laminas\Console\Request;
 use Laminas\EventManager\EventManagerInterface;
 use Laminas\EventManager\ListenerAggregateInterface;
 use Laminas\Mvc\Application;
 use Laminas\Mvc\MvcEvent;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
-use Laminas\Stdlib\RequestInterface;
 
 /**
  * A listener that injects relevant Magento initialization parameters and initializes filesystem
@@ -138,25 +136,26 @@ private function extractInitParameters(Application $application)
                 $result[$initKey] = $_SERVER[$initKey];
             }
         }
-        $result = array_replace_recursive($result, $this->extractFromCli($application->getRequest()));
-        return $result;
+
+        if (!isset($result['argv']) || !is_array($result['argv'])) {
+            return $result;
+        }
+
+        return array_replace_recursive($result, $this->extractFromCli($result['argv']));
     }
 
     /**
      * Extracts the directory paths from a CLI request
      *
      * Uses format of a URL query
      *
-     * @param RequestInterface $request
+     * @param array $argv
      * @return array
      */
-    private function extractFromCli(RequestInterface $request)
+    private function extractFromCli(array $argv): array
     {
-        if (!($request instanceof Request)) {
-            return [];
-        }
         $bootstrapParam = new ComplexParameter(self::BOOTSTRAP_PARAM);
-        foreach ($request->getContent() as $paramStr) {
+        foreach ($argv as $paramStr) {
             $result = $bootstrapParam->getFromString($paramStr);
             if (!empty($result)) {
                 return $result;