MC-36456: union implementation

cpartica · cpartica · commit 24b3dfe36d2d · 2020-08-13T13:19:22.000-05:00
diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -35,7 +35,9 @@ directive @resolver(class: String="") on QUERY
     | INPUT_OBJECT
     | INPUT_FIELD_DEFINITION
 
-directive @typeResolver(class: String="") on INTERFACE | OBJECT | UNION
+directive @typeResolver(class: String="") on UNION
+    | INTERFACE
+    | OBJECT
 
 directive @cache(cacheIdentity: String="" cacheable: Boolean=true) on QUERY
 
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Filter.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Filter.php
@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function applyArgument(
         SearchCriteriaInterface $searchCriteria,
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Sort.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Sort.php
@@ -33,7 +33,7 @@ public function __construct(SortOrderBuilder $sortOrderBuilder = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function applyArgument(
         SearchCriteriaInterface $searchCriteria,
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php
@@ -32,7 +32,7 @@ public function __construct(OutputMapper $outputMapper)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
@@ -33,7 +33,7 @@ public function __construct(ObjectManagerInterface $objectManager)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
@@ -32,7 +32,7 @@ public function __construct(OutputMapper $outputMapper)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
 
 /**
- * {@inheritdoc}
+ * @inheritDoc
  */
 class FormatterComposite implements FormatterInterface
 {
@@ -29,7 +29,7 @@ public function __construct(array $formatters)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -71,7 +71,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      *
      * @param string|null $scope
      * @return array
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php
@@ -30,7 +30,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
@@ -69,7 +69,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
@@ -62,9 +62,9 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
                 'types' => $types,
             ];
 
-            $unionResolveType = $this->getUnionTypeResolver($typeMeta);
-            if (!empty($unionResolveType)) {
-                $result['typeResolver'] = $unionResolveType;
+            $unionTypeResolver = $this->getUnionTypeResolver($typeMeta);
+            if (!empty($unionTypeResolver)) {
+                $result['typeResolver'] = $unionTypeResolver;
             }
 
 
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeReaderComposite.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeReaderComposite.php
@@ -25,7 +25,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct(`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`54`		`- * {@inheritdoc}`
	`54`	`+ * @inheritDoc`
`55`	`55`	`*/`
`56`	`56`	`public function applyArgument(`
`57`	`57`	`SearchCriteriaInterface $searchCriteria,`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct(SortOrderBuilder $sortOrderBuilder = null)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * {@inheritdoc}`
	`36`	`+ * @inheritDoc`
`37`	`37`	`*/`
`38`	`38`	`public function applyArgument(`
`39`	`39`	`SearchCriteriaInterface $searchCriteria,`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(OutputMapper $outputMapper)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`
`35`		`- * {@inheritDoc}`
	`35`	`+ * @inheritDoc`
`36`	`36`	`*/`
`37`	`37`	`public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * {@inheritdoc}`
	`14`	`+ * @inheritDoc`
`15`	`15`	`*/`
`16`	`16`	`class FormatterComposite implements FormatterInterface`
`17`	`17`	`{`
`@@ -29,7 +29,7 @@ public function __construct(array $formatters)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`		`- * {@inheritDoc}`
	`32`	`+ * @inheritDoc`
`33`	`33`	`*/`
`34`	`34`	`public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function __construct(`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
`74`		`- * @inheritdoc`
	`74`	`+ * @inheritDoc`
`75`	`75`	`*`
`76`	`76`	`* @param string\|null $scope`
`77`	`77`	`* @return array`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function __construct(`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`
`33`		`- * @inheritdoc`
	`33`	`+ * @inheritDoc`
`34`	`34`	`*/`
`35`	`35`	`public function read(\GraphQL\Type\Definition\Type $typeMeta) : array`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function __construct(`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * @inheritdoc`
	`52`	`+ * @inheritDoc`
`53`	`53`	`*/`
`54`	`54`	`public function read(\GraphQL\Type\Definition\Type $typeMeta) : array`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function __construct(`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
`72`		`- * @inheritdoc`
	`72`	`+ * @inheritDoc`
`73`	`73`	`*/`
`74`	`74`	`public function read(\GraphQL\Type\Definition\Type $typeMeta) : array`
`75`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function __construct(`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/**`
`28`		`- * {@inheritdoc}`
	`28`	`+ * @inheritDoc`
`29`	`29`	`*/`
`30`	`30`	`public function read(\GraphQL\Type\Definition\Type $typeMeta) : array`
`31`	`31`	`{`