Merge pull request #5338 from magento-trigger/MC-31567

[TR] MC-31567: Migrate ZF components to Laminas part 2

Author: fascinosum

composer.json

@@ -33,7 +33,7 @@
         "colinmollenhour/cache-backend-redis": "1.10.6",
         "colinmollenhour/credis": "1.10.0",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-        "composer/composer": "^1.6",
+        "composer/composer": "^1.9",
         "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-captcha": "^2.7.1",
@@ -320,7 +320,7 @@
             "Magento\\Framework\\": "lib/internal/Magento/Framework/",
             "Magento\\Setup\\": "setup/src/Magento/Setup/",
             "Magento\\": "app/code/Magento/",
-            "Laminas\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
+            "Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
         },
         "psr-0": {
             "": [

composer.lock

@@ -11,6 +11,7 @@
     },
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
+        "ext-bcmath": "*",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-gd": "*",
@@ -20,26 +21,25 @@
         "ext-openssl": "*",
         "ext-simplexml": "*",
         "ext-xsl": "*",
-        "ext-bcmath": "*",
         "lib-libxml": "*",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-        "composer/composer": "^1.6",
-        "magento/zendframework1": "~1.14.2",
-        "monolog/monolog": "^1.17",
-        "wikimedia/less.php": "~1.8.0",
-        "symfony/console": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
-        "symfony/process": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
-        "tedivm/jshrink": "~1.3.0",
+        "composer/composer": "^1.9",
+        "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-code": "~3.3.0",
         "laminas/laminas-crypt": "^2.6.0",
         "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-stdlib": "^3.2.1",
         "laminas/laminas-uri": "^2.5.1",
         "laminas/laminas-validator": "^2.6.0",
-        "laminas/laminas-mail": "^2.9.0",
-        "laminas/laminas-mime": "^2.5.0",
-        "guzzlehttp/guzzle": "^6.3.3"
+        "magento/zendframework1": "~1.14.2",
+        "monolog/monolog": "^1.17",
+        "symfony/console": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
+        "symfony/process": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
+        "tedivm/jshrink": "~1.3.0",
+        "wikimedia/less.php": "~1.8.0"
     },
     "archive": {
         "exclude": [

lib/internal/Magento/Framework/composer.json

@@ -37,7 +37,7 @@
     ],
     'controllers' => [
         'abstract_factories' => [
-            \Laminas\Mvc\Controller\LazyControllerAbstractFactory::class,
+            \Zend\Mvc\Controller\LazyControllerAbstractFactory::class,
         ],
     ],
 ];

setup/config/module.config.php

@@ -8,7 +8,7 @@
 
 declare(strict_types=1);
 
-namespace Laminas\Mvc\Controller;
+namespace Zend\Mvc\Controller;
 
 use Interop\Container\ContainerInterface;
 use ReflectionClass;