Merge branch 'AC-7723' of github.com:magento-gl/magento2ce into Hammer_Regression_Blocker_issues_19jan22

 Conflicts:
	composer.lock
	dev/tests/static/framework/Magento/PhpStan/Formatters/FilteredErrorFormatter.php
	lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/FieldMetaReader.php
	lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/TypeMetaWrapperReader.php

Author: faizan-shk

composer.lock

@@ -66,18 +66,7 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
             return self::NO_ERRORS;
         }
 
-        // @phpstan-ignore-next-line
-        $clearedAnalysisResult = new AnalysisResult(
-            $this->clearIgnoredErrors($analysisResult->getFileSpecificErrors()),
-            $analysisResult->getNotFileSpecificErrors(),
-            $analysisResult->getInternalErrors(),
-            $analysisResult->getWarnings(),
-            $analysisResult->isDefaultLevelUsed(),
-            $analysisResult->getProjectConfigFile(),
-            $analysisResult->isResultCacheSaved()
-        );
-
-        return $this->tableErrorFormatter->formatErrors($clearedAnalysisResult, $output);
+        return $this->tableErrorFormatter->formatErrors($analysisResult, $output);
     }
 
     /**

dev/tests/static/framework/Magento/PhpStan/Formatters/FilteredErrorFormatter.php

@@ -128,7 +128,7 @@ public function read(\GraphQL\Type\Definition\FieldDefinition $fieldMeta) : arra
     private function argumentMetaType(
         InputType $typeMeta,
         Argument $argumentMeta,
-        $result
+        array $result
     ) : array {
         $argumentName = $argumentMeta->name;
         $result['arguments'][$argumentName]  = array_merge(

lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/MetaReader/FieldMetaReader.php

@@ -7,7 +7,10 @@
 
 namespace Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader;
 
+use GraphQL\Type\Definition\ListOfType;
 use GraphQL\Type\Definition\NonNull;
+use GraphQL\Type\Definition\ScalarType;
+use GraphQL\Type\Definition\Type;
 
 /**
  * Common cases for types that need extra formatting like wrapping or additional properties added to their definition
@@ -23,11 +26,11 @@ class TypeMetaWrapperReader
     /**
      * Read from type meta data and determine wrapping types that are needed and extra properties that need to be added
      *
-     * @param \GraphQL\Type\Definition\Type $meta
+     * @param Type $meta
      * @param string $parameterType Argument|OutputField|InputField
      * @return array
      */
-    public function read(\GraphQL\Type\Definition\Type $meta, string $parameterType) : array
+    public function read(Type $meta, string $parameterType) : array
     {
         $result = [];
         if ($meta instanceof NonNull) {
@@ -36,8 +39,8 @@ public function read(\GraphQL\Type\Definition\Type $meta, string $parameterType)
         } else {
             $result['required'] = false;
         }
-        if ($meta instanceof \GraphQL\Type\Definition\ListOfType) {
-            $itemTypeMeta = $meta->getInnermostType();
+        if ($meta instanceof ListOfType) {
+            $itemTypeMeta = $meta->getWrappedType();
             if ($itemTypeMeta instanceof NonNull) {
                 $result['itemsRequired'] = true;
                 $itemTypeMeta = $itemTypeMeta->getWrappedType();
@@ -46,7 +49,7 @@ public function read(\GraphQL\Type\Definition\Type $meta, string $parameterType)
             }
             $itemTypeName = $itemTypeMeta->name;
             $result['itemType'] = $itemTypeName;
-            if ($itemTypeMeta instanceof \GraphQL\Type\Definition\ScalarType) {
+            if ($itemTypeMeta instanceof ScalarType) {
                 $result['type'] = 'ScalarArray' . $parameterType;
             } else {
                 $result['type'] = 'ObjectArray' . $parameterType;