Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-com-pr15

Author: zakdma

app/code/Magento/Captcha/composer.json

@@ -11,9 +11,9 @@
         "magento/module-checkout": "*",
         "magento/module-customer": "*",
         "magento/module-store": "*",
-        "zendframework/zend-captcha": "^2.7.1",
-        "zendframework/zend-db": "^2.8.2",
-        "zendframework/zend-session": "^2.7.3"
+        "laminas/laminas-captcha": "^2.7.1",
+        "laminas/laminas-db": "^2.8.2",
+        "laminas/laminas-session": "^2.7.3"
     },
     "type": "magento2-module",
     "license": [

composer.json

@@ -35,11 +35,40 @@
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.6",
         "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
+        "guzzlehttp/guzzle": "^6.3.3",
+        "laminas/laminas-captcha": "^2.7.1",
+        "laminas/laminas-code": "~3.3.0",
+        "laminas/laminas-config": "^2.6.0",
+        "laminas/laminas-console": "^2.6.0",
+        "laminas/laminas-crypt": "^2.6.0",
+        "laminas/laminas-db": "^2.8.2",
+        "laminas/laminas-dependency-plugin": "^1.0",
+        "laminas/laminas-di": "^2.6.1",
+        "laminas/laminas-eventmanager": "^3.0.0",
+        "laminas/laminas-feed": "^2.9.0",
+        "laminas/laminas-form": "^2.10.0",
+        "laminas/laminas-http": "^2.6.0",
+        "laminas/laminas-i18n": "^2.7.3",
+        "laminas/laminas-json": "^2.6.1",
+        "laminas/laminas-log": "^2.9.1",
+        "laminas/laminas-mail": "^2.9.0",
+        "laminas/laminas-mime": "^2.5.0",
+        "laminas/laminas-modulemanager": "^2.7",
+        "laminas/laminas-mvc": "~2.7.0",
+        "laminas/laminas-serializer": "^2.7.2",
+        "laminas/laminas-server": "^2.6.1",
+        "laminas/laminas-servicemanager": "^2.7.8",
+        "laminas/laminas-session": "^2.7.3",
+        "laminas/laminas-soap": "^2.7.0",
+        "laminas/laminas-stdlib": "^3.2.1",
+        "laminas/laminas-text": "^2.6.0",
+        "laminas/laminas-uri": "^2.5.1",
+        "laminas/laminas-validator": "^2.6.0",
+        "laminas/laminas-view": "~2.11.2",
         "magento/composer": "~1.5.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.2",
         "monolog/monolog": "^1.17",
-        "wikimedia/less.php": "~1.8.0",
         "paragonie/sodium_compat": "^1.6",
         "pelago/emogrifier": "^2.0.0",
         "php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
@@ -52,35 +81,7 @@
         "tedivm/jshrink": "~1.3.0",
         "tubalmartin/cssmin": "4.1.1",
         "webonyx/graphql-php": "^0.13.8",
-        "zendframework/zend-captcha": "^2.7.1",
-        "zendframework/zend-code": "~3.3.0",
-        "zendframework/zend-config": "^2.6.0",
-        "zendframework/zend-console": "^2.6.0",
-        "zendframework/zend-crypt": "^2.6.0",
-        "zendframework/zend-db": "^2.8.2",
-        "zendframework/zend-di": "^2.6.1",
-        "zendframework/zend-eventmanager": "^3.0.0",
-        "zendframework/zend-feed": "^2.9.0",
-        "zendframework/zend-form": "^2.10.0",
-        "zendframework/zend-http": "^2.6.0",
-        "zendframework/zend-i18n": "^2.7.3",
-        "zendframework/zend-json": "^2.6.1",
-        "zendframework/zend-log": "^2.9.1",
-        "zendframework/zend-mail": "^2.9.0",
-        "zendframework/zend-mime": "^2.5.0",
-        "zendframework/zend-modulemanager": "^2.7",
-        "zendframework/zend-mvc": "~2.7.0",
-        "zendframework/zend-serializer": "^2.7.2",
-        "zendframework/zend-server": "^2.6.1",
-        "zendframework/zend-servicemanager": "^2.7.8",
-        "zendframework/zend-session": "^2.7.3",
-        "zendframework/zend-soap": "^2.7.0",
-        "zendframework/zend-stdlib": "^3.2.1",
-        "zendframework/zend-text": "^2.6.0",
-        "zendframework/zend-uri": "^2.5.1",
-        "zendframework/zend-validator": "^2.6.0",
-        "zendframework/zend-view": "~2.11.2",
-        "guzzlehttp/guzzle": "^6.3.3"
+        "wikimedia/less.php": "~1.8.0"
     },
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
@@ -319,7 +320,7 @@
             "Magento\\Framework\\": "lib/internal/Magento/Framework/",
             "Magento\\Setup\\": "setup/src/Magento/Setup/",
             "Magento\\": "app/code/Magento/",
-            "Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
+            "Laminas\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
         },
         "psr-0": {
             "": [