Merge remote-tracking branch 'origin/php8-develop' into 32321-31854-migrate-from-laminas-console

Author: hws47a

composer.json

@@ -36,7 +36,7 @@
         "elasticsearch/elasticsearch": "~7.11.0",
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-captcha": "^2.7.1",
-        "laminas/laminas-code": "~3.4.1",
+        "laminas/laminas-code": "^3.5.1",
         "laminas/laminas-crypt": "^3.4.0",
         "laminas/laminas-db": "^2.12.0",
         "laminas/laminas-dependency-plugin": "^2.1.0",
@@ -49,19 +49,19 @@
         "laminas/laminas-json": "^3.2.0",
         "laminas/laminas-log": "^2.9.1",
         "laminas/laminas-mail": "^2.9.0",
-        "laminas/laminas-mime": "^2.5.0",
+        "laminas/laminas-mime": "^2.8.0",
         "laminas/laminas-modulemanager": "^2.7",
         "laminas/laminas-mvc": "^3.2.0",
         "laminas/laminas-serializer": "^2.7.2",
         "laminas/laminas-server": "^2.6.1",
         "laminas/laminas-servicemanager": "^3.6.0",
         "laminas/laminas-session": "^2.7.3",
-        "laminas/laminas-soap": "^2.7.0",
+        "laminas/laminas-soap": "^2.9.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",
+        "laminas/laminas-view": "~2.12.0",
         "league/flysystem": "^1.0",
         "league/flysystem-aws-s3-v3": "^1.0",
         "league/flysystem-cached-adapter": "^1.0",

composer.lock

@@ -25,11 +25,11 @@
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.9 || ^2.0",
         "guzzlehttp/guzzle": "^6.3.3",
-        "laminas/laminas-code": "~3.4.1",
+        "laminas/laminas-code": "^3.5.1",
         "laminas/laminas-crypt": "^3.4.0",
         "laminas/laminas-http": "^2.6.0",
         "laminas/laminas-mail": "^2.9.0",
-        "laminas/laminas-mime": "^2.5.0",
+        "laminas/laminas-mime": "^2.8.0",
         "laminas/laminas-mvc": "^3.2.0",
         "laminas/laminas-stdlib": "^3.2.1",
         "laminas/laminas-uri": "^2.5.1",

lib/internal/Magento/Framework/composer.json

@@ -38,6 +38,14 @@ protected function scan()
             define('T_TRAIT', 42001);
         }
 
+        // ensure php backwards compatibility (from laminas code 3.5.x)
+        if (!defined('T_NAME_QUALIFIED')) {
+            define('T_NAME_QUALIFIED', 24001);
+        }
+        if (!defined('T_NAME_FULLY_QUALIFIED')) {
+            define('T_NAME_FULLY_QUALIFIED', 24002);
+        }
+
         /**
          * Variables & Setup
          */