MC-40555: Add PHP 7.4 declaration

fascinosum · fascinosum · commit ce26664ca3e7 · 2021-02-11T15:39:17.000-06:00
diff --git a/composer.json b/composer.json
@@ -36,8 +36,8 @@
         "lib-libxml": "*",
         "braintree/braintree_php": "3.35.0",
         "colinmollenhour/cache-backend-file": "~1.4.1",
-        "colinmollenhour/cache-backend-redis": "1.10.6",
-        "colinmollenhour/credis": "1.10.0",
+        "colinmollenhour/cache-backend-redis": "1.11.0",
+        "colinmollenhour/credis": "1.11.1",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.9",
         "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1||~7.6",
@@ -98,7 +98,7 @@
         "magento/magento2-functional-testing-framework": "MQE-2501-php74-dev",
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
-        "phpmd/phpmd": "@stable",
+        "phpmd/phpmd": "^2.8.0",
         "phpstan/phpstan": ">=0.12.3 <=0.12.23",
         "phpunit/phpunit": "^9",
         "sebastian/phpcpd": "~5.0.0",
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
@@ -5,7 +5,7 @@
     "sort-packages": true
   },
   "require": {
-    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "php": "~7.3.0||~7.4.0",
     "magento/framework": "*",
     "magento/module-integration": "*"
   },
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
@@ -5,7 +5,7 @@
     "sort-packages": true
   },
   "require": {
-    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "php": "~7.3.0||~7.4.0",
     "magento/framework": "*",
     "magento/module-sales": "*"
   },
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig/composer.json b/dev/tests/integration/_files/Magento/TestModuleCspConfig/composer.json
@@ -5,7 +5,7 @@
     "sort-packages": true
   },
   "require": {
-    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "php": "~7.3.0||~7.4.0",
     "magento/framework": "*",
     "magento/module-integration": "*"
   },
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig2/composer.json b/dev/tests/integration/_files/Magento/TestModuleCspConfig2/composer.json
@@ -5,7 +5,7 @@
     "sort-packages": true
   },
   "require": {
-    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "php": "~7.3.0||~7.4.0",
     "magento/framework": "*",
     "magento/module-integration": "*"
   },
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/composer.json b/dev/tests/integration/_files/Magento/TestModuleCspUtil/composer.json
@@ -5,7 +5,7 @@
     "sort-packages": true
   },
   "require": {
-    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "php": "~7.3.0||~7.4.0",
     "magento/framework": "*",
     "magento/module-integration": "*"
   },
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-test-module-message-queue-config-override",
     "description": "test module for message queue configuration",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-integration": "*"
     },
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-test-module-message-queue-configuration",
     "description": "test module for message queue configuration",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-integration": "*"
     },
diff --git a/dev/tests/integration/_files/Magento/TestModuleSample/composer.json b/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
@@ -5,7 +5,7 @@
     "sort-packages": true
   },
   "require": {
-    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "php": "~7.3.0||~7.4.0",
     "magento/framework": "*",
     "magento/module-integration": "*"
   },
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-theme",
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/theme-frontend-zoom1": "*"
     },
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/theme-frontend-zoom2": "*"
     },
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
@@ -4,7 +4,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "0.1",
         "magento/module-b": "0.1"
     },
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
@@ -4,7 +4,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-a": "0.1"
     },
diff --git a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-theme",
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/AutogeneratedClassNotInConstructorFinder.php b/dev/tests/static/framework/Magento/TestFramework/Utility/AutogeneratedClassNotInConstructorFinder.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\TestFramework\Utility;
 
+use ReflectionNamedType;
+
 /**
  * Find classes created by object manager that are not requested in constructor. All autogenerated classes should be
  * requested in constructor, otherwise compiler will not be able to find and generate these classes
@@ -85,8 +87,9 @@ private function getConstructorArguments($className)
             $classParameters = $constructor->getParameters();
             foreach ($classParameters as $classParameter) {
                 if ($classParameter->getType()) {
+                    /** @var ReflectionNamedType $parameterType */
                     $parameterType = $classParameter->getType();
-                    $arguments[] = ltrim($parameterType, '\\');
+                    $arguments[] = ltrim($parameterType->getName(), '\\');
                 }
             }
         }
diff --git a/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php b/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
@@ -52,7 +52,7 @@ public function __toString()
                 $parts[] = $part;
             }
         }
-        $sql = implode($parts, $this->type);
+        $sql = implode($this->type, $parts);
         if ($this->pattern) {
             return sprintf($this->pattern, $sql);
         }
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
@@ -25,7 +25,7 @@
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.9",
         "guzzlehttp/guzzle": "^6.3.3",
-        "laminas/laminas-code": "~3.3.0",
+        "laminas/laminas-code": "~3.4.1",
         "laminas/laminas-crypt": "^2.6.0",
         "laminas/laminas-http": "^2.6.0",
         "laminas/laminas-mail": "^2.9.0",
