Merge branch '2.3-develop-php74' of https://github.com/magento-commerce/magento2ce into MC-40559

Author: jcuerdo

dev/tests/static/framework/Magento/TestFramework/Utility/AutogeneratedClassNotInConstructorFinder.php

@@ -8,8 +8,7 @@
 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
+ * Find classes created by object manager that are not requested in constructor.
  */
 class AutogeneratedClassNotInConstructorFinder
 {
@@ -99,8 +98,8 @@ private function getConstructorArguments($className)
     /**
      * Match partial namespace
      *
-     * @param $fileContent
-     * @param $shortName
+     * @param string $fileContent
+     * @param string $shortName
      * @return string
      */
     private function matchPartialNamespace($fileContent, $shortName)

dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php

@@ -42,12 +42,9 @@ private function getWhitelist(): array
             );
             $whiteListItems = [];
             foreach (glob($whiteListFiles) as $fileName) {
-                $whiteListItems = array_merge(
-                    $whiteListItems,
-                    file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
-                );
+                $whiteListItems[] = file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
             }
-            $this->blockWhitelist = $whiteListItems;
+            $this->blockWhitelist = array_merge([], ...$whiteListItems);
         }
         return $this->blockWhitelist;
     }
@@ -123,7 +120,7 @@ public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
             $returnTypes = [];
             if ($method->hasReturnType()) {
                 if (!$method->getReturnType()->isBuiltin()) {
-                    $returnTypes = [trim($method->getReturnType()->__toString(), '?[]')];
+                    $returnTypes = [trim($method->getReturnType()->getName(), '?[]')];
                 }
             } else {
                 $returnTypes = $this->getReturnTypesFromDocComment($method->getDocComment());
@@ -278,7 +275,7 @@ private function checkParameters($class, \ReflectionMethod $method, array $nonPu
         foreach ($method->getParameters() as $parameter) {
             if ($parameter->hasType()
                 && !$parameter->getType()->isBuiltin()
-                && !$this->isGenerated($parameter->getType()->__toString())
+                && !$this->isGenerated($parameter->getType()->getName())
             ) {
                 $parameterClass = $parameter->getClass();
                 /*

lib/internal/Magento/Framework/DB/Sql/UnionExpression.php

@@ -8,7 +8,7 @@
 use Magento\Framework\DB\Select;
 
 /**
- * Class UnionExpression
+ * Class UnionExpression handles the build of union clauses in database queries
  */
 class UnionExpression extends Expression
 {

lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php

@@ -10,7 +10,8 @@
 use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
 
 /**
- * Class BatchConsumer
+ * BatchConsumer is a consumer class which implements the consumer interface
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BatchConsumer implements ConsumerInterface
@@ -74,9 +75,7 @@ class BatchConsumer implements ConsumerInterface
      * @param ConsumerConfigurationInterface $configuration
      * @param int $interval [optional]
      * @param int $batchSize [optional]
-     * @param MessageProcessorLoader $messageProcessorLoader [optional]
-     * @param MessageController $messageController [optional]
-     * @param ConsumerConfig $consumerConfig [optional]
+     * @param MessageProcessorLoader|null $messageProcessorLoader [optional]
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -103,7 +102,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process($maxNumberOfMessages = null)
     {