Merge remote-tracking branch 'remotes/origin/MAGETWO-83859-MetadataService-Attribute-Type-Resolver' into MAGETWO-83872-Implement-Metadata-Service

Eric Bohanon · Eric Bohanon · commit a279d9c474c3 · 2017-12-01T15:02:48.000-06:00
diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -92,7 +92,6 @@ public function dispatch(RequestInterface $request)
             );
         } catch (\Exception $error) {
             $result['extensions']['exception'] = $this->graphQlError->create($error);
-            $this->response->setStatusCode(500);
         }
         $this->response->setBody($this->jsonSerializer->serialize($result))->setHeader(
             'Content-Type',
diff --git a/app/code/Magento/GraphQl/Model/SchemaGenerator.php b/app/code/Magento/GraphQl/Model/SchemaGenerator.php
@@ -8,7 +8,6 @@
 
 use GraphQl\Type\Definition\ResolveInfo;
 use Magento\Framework\GraphQl\Type\SchemaFactory;
-use Magento\Framework\GraphQl\Type\Schema;
 use Magento\GraphQl\Model\Type\Generator;
 use Magento\Framework\GraphQl\ArgumentFactory;
 use Magento\Framework\GraphQl\Type\TypeFactory;
diff --git a/app/code/Magento/GraphQl/Model/Type/Generator.php b/app/code/Magento/GraphQl/Model/Type/Generator.php
@@ -7,9 +7,9 @@
 namespace Magento\GraphQl\Model\Type;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Type\Definition\Type;
 use Magento\GraphQl\Model\Type\Handler\Pool;
 use Magento\Framework\GraphQl\Type\TypeFactory;
+use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
 
 /**
  * {@inheritdoc}
@@ -83,7 +83,7 @@ public function generateTypes(string $typeName)
      *
      * @param string $argumentName
      * @param string $argumentType
-     * @return Type
+     * @return TypeInterface|\GraphQL\Type\Definition\Type
      */
     private function decorateType(string $argumentName, string $argumentType)
     {
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/AttributeInput.php b/app/code/Magento/GraphQl/Model/Type/Handler/AttributeInput.php
@@ -6,7 +6,6 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\InputObjectType;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
 
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/ConfigurableProduct.php b/app/code/Magento/GraphQl/Model/Type/Handler/ConfigurableProduct.php
@@ -6,8 +6,6 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\ListOfType;
-use Magento\Framework\GraphQl\Type\Definition\ObjectType;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
 
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/CustomAttributeMetadata.php b/app/code/Magento/GraphQl/Model/Type/Handler/CustomAttributeMetadata.php
@@ -6,10 +6,9 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\ListOfType;
-use Magento\Framework\GraphQl\Type\Definition\ObjectType;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
+use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
 
 /**
  * Defines type information for custom attribute metadata
@@ -54,7 +53,7 @@ public function getType()
     /**
      * Get and register array of fields for CustomAttributeMetadata type
      *
-     * @return array
+     * @return TypeInterface[]
      */
     private function getFields(): array
     {
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/Pool.php b/app/code/Magento/GraphQl/Model/Type/Handler/Pool.php
@@ -49,10 +49,10 @@ public function __construct(
     }
 
     /**
-     * Get a Type
+     * Get a type of @see TypeInterface or scalar native GraphQL
      *
      * @param string $typeName
-     * @return TypeInterface
+     * @return TypeInterface|\GraphQL\Type\Definition\Type
      * @throws \LogicException
      */
     public function getType(string $typeName)
@@ -73,7 +73,7 @@ public function getType(string $typeName)
      * Retrieve type's configuration based off name
      *
      * @param string $typeName
-     * @return TypeInterface|null
+     * @return TypeInterface
      * @throws \LogicException Type Handler could not be found, and type does not exist in registry
      */
     public function getComplexType(string $typeName)
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/Product.php b/app/code/Magento/GraphQl/Model/Type/Handler/Product.php
@@ -6,16 +6,14 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\InterfaceType;
-use Magento\Framework\GraphQl\Type\Definition\Type;
 use Magento\Eav\Api\AttributeManagementInterface;
 use Magento\Framework\Exception\InputException;
 use Magento\GraphQl\Model\Type\Helper\ServiceContract\TypeGenerator;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
 
 /**
- * Define Product's GraphQL type
+ * Define product's GraphQL type
  */
 class Product implements HandlerInterface
 {
@@ -92,7 +90,7 @@ public function getType()
      * Retrieve Product base fields
      *
      * @param string $typeName
-     * @return Type[]
+     * @return array
      * @throws \LogicException Schema failed to generate from service contract type name
      */
     private function getFields(string $typeName)
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/ProductAttributeSearchCriteria.php b/app/code/Magento/GraphQl/Model/Type/Handler/ProductAttributeSearchCriteria.php
@@ -6,8 +6,6 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\InputObjectType;
-use Magento\Framework\GraphQl\Type\Definition\Type;
 use Magento\Eav\Api\AttributeManagementInterface;
 use Magento\GraphQl\Model\Type\Helper\ServiceContract\TypeGenerator;
 use Magento\GraphQl\Model\Type\HandlerInterface;
@@ -65,7 +63,7 @@ public function getType()
     /**
      * Retrieve fields
      *
-     * @return Type[]
+     * @return \Closure|array
      */
     private function getFields()
     {
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/ProductGroupSearchCriteria.php b/app/code/Magento/GraphQl/Model/Type/Handler/ProductGroupSearchCriteria.php
@@ -6,8 +6,6 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\InputObjectType;
-use Magento\Framework\GraphQl\Type\Definition\Type;
 use Magento\GraphQl\Model\Type\Helper\ServiceContract\TypeGenerator;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
@@ -54,7 +52,7 @@ public function getType()
     /**
      * Retrieve Product base fields
      *
-     * @return Type[]
+     * @return array
      */
     private function getFields()
     {
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/ProductSort.php b/app/code/Magento/GraphQl/Model/Type/Handler/ProductSort.php
@@ -6,10 +6,8 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\Type;
 use Magento\Eav\Api\AttributeManagementInterface;
 use Magento\GraphQl\Model\Type\Helper\ServiceContract\TypeGenerator as Generator;
-use Magento\Framework\GraphQl\Type\Definition\InputObjectType;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
 
@@ -73,7 +71,7 @@ public function getType()
     /**
      * Retrieve fields
      *
-     * @return Type[]
+     * @return array
      */
     private function getFields()
     {
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/Products.php b/app/code/Magento/GraphQl/Model/Type/Handler/Products.php
@@ -6,9 +6,6 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\ListOfType;
-use Magento\Framework\GraphQl\Type\Definition\Type;
-use Magento\Framework\GraphQl\Type\Definition\ObjectType;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
 
@@ -54,7 +51,7 @@ public function getType()
     /**
      * Retrieve the result fields
      *
-     * @return Type[]
+     * @return array
      */
     private function getFields()
     {
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/SearchCriteriaExpression.php b/app/code/Magento/GraphQl/Model/Type/Handler/SearchCriteriaExpression.php
@@ -6,8 +6,6 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\InputObjectType;
-use Magento\Framework\GraphQl\Type\Definition\Type;
 use Magento\GraphQl\Model\Type\Helper\ServiceContract\TypeGenerator;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
@@ -54,7 +52,7 @@ public function getType()
     /**
      * Retrieve fields
      *
-     * @return Type[]
+     * @return array
      */
     private function getFields()
     {
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/SearchResultPageInfo.php b/app/code/Magento/GraphQl/Model/Type/Handler/SearchResultPageInfo.php
@@ -6,8 +6,6 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\ObjectType;
-use Magento\Framework\GraphQl\Type\Definition\Type;
 use Magento\GraphQl\Model\Type\Helper\ServiceContract\TypeGenerator;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
@@ -54,7 +52,7 @@ public function getType()
     /**
      * Retrieve fields
      *
-     * @return Type[]
+     * @return array
      */
     private function getFields()
     {
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/SimpleProduct.php b/app/code/Magento/GraphQl/Model/Type/Handler/SimpleProduct.php
@@ -6,7 +6,6 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\ObjectType;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
 
diff --git a/app/code/Magento/GraphQl/Model/Type/Handler/SortEnum.php b/app/code/Magento/GraphQl/Model/Type/Handler/SortEnum.php
@@ -6,7 +6,6 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\EnumType;
 use Magento\GraphQl\Model\Type\Generator;
 use Magento\GraphQl\Model\Type\HandlerInterface;
 use Magento\Framework\GraphQl\Type\TypeFactory;
diff --git a/app/code/Magento/GraphQl/Model/Type/Helper/ServiceContract/TypeGenerator.php b/app/code/Magento/GraphQl/Model/Type/Helper/ServiceContract/TypeGenerator.php
@@ -6,14 +6,13 @@
 
 namespace Magento\GraphQl\Model\Type\Helper\ServiceContract;
 
-use Magento\Framework\GraphQl\Type\Definition\ListOfType;
-use Magento\Framework\GraphQl\Type\Definition\Type;
-use Magento\Framework\GraphQl\Type\Definition\ObjectType;
+use Magento\Framework\GraphQl\Type\Definition\InterfaceType;
 use Magento\GraphQl\Model\Type\Handler\Pool;
 use Magento\Framework\Reflection\TypeProcessor;
 use Magento\Webapi\Model\ServiceMetadata;
 use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\GraphQl\Type\TypeFactory;
+use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
 
 /**
  * Translate web API service contract layer from array-style schema to GraphQL types
@@ -79,7 +78,7 @@ public function __construct(
      *
      * @param string $typeName
      * @param array $schema
-     * @return Type
+     * @return TypeInterface|\GraphQL\Type\Definition\Type
      */
     public function generate(
         string $typeName,
@@ -145,7 +144,7 @@ public function getTypeData(string $type)
      * @param array $schema
      * @param bool $skipField
      * @param string|null $parentField
-     * @return ObjectType|Type|mixed|null
+     * @return InterfaceType|\GraphQL\Type\Definition\Type|mixed|null
      */
     private function generateNestedTypes(
         string $typeName,
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Find/Clause.php b/lib/internal/Magento/Framework/GraphQl/Argument/Find/Clause.php
@@ -8,7 +8,7 @@
 use Magento\Framework\GraphQl\Argument\Find\Clause\ReferenceType;
 
 /**
- * Class Clause refers to a clause in find argument.
+ * Class clause refers to a closure in find argument.
  *
  * Example: {sku: {eq: "product"}}
  */
@@ -83,7 +83,7 @@ public function getClauseType()
     }
 
     /**
-     * Get the Clause value
+     * Get the clause value
      *
      * @return string|array
      */
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Find/Clause/ReferenceType.php b/lib/internal/Magento/Framework/GraphQl/Argument/Find/Clause/ReferenceType.php
@@ -7,7 +7,7 @@
 namespace Magento\Framework\GraphQl\Argument\Find\Clause;
 
 /**
- * Class that hold relation between Entities through fields
+ * Class that hold relation between entities through fields
  */
 class ReferenceType
 {
@@ -42,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * Get the reference type
+     *
      * @return ReferenceType
      */
     public function getReferenceType()
@@ -50,6 +52,8 @@ public function getReferenceType()
     }
 
     /**
+     * Get the linked field as string
+     *
      * @return string
      */
     public function getLinkField()
@@ -58,6 +62,8 @@ public function getLinkField()
     }
 
     /**
+     * Get the entity type
+     *
      * @return string
      */
     public function getEntityType()
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Find/Clause/ReferenceTypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Argument/Find/Clause/ReferenceTypeFactory.php
@@ -8,7 +8,7 @@
 use Magento\Framework\ObjectManagerInterface;
 
 /**
- * Factory for ReferenceType
+ * Factory for @see ReferenceType
  */
 class ReferenceTypeFactory
 {
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Find/ClauseFactory.php b/lib/internal/Magento/Framework/GraphQl/Argument/Find/ClauseFactory.php
@@ -9,7 +9,7 @@
 use Magento\Framework\GraphQl\Argument\Find\Clause\ReferenceType;
 
 /**
- * Factory for Clause Class
+ * Factory for the @see Clause class
  */
 class ClauseFactory
 {
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Find/Connective.php b/lib/internal/Magento/Framework/GraphQl/Argument/Find/Connective.php
@@ -8,7 +8,7 @@
 /**
  * Class Represents logical connective whenever a condition will nest/branch.
  *
- * A clause can be branched by "and" or "or" Operator and has a list of conditions as sub clauses.
+ * A clause can be branched by "and" or "or" operator and has a list of conditions as sub clauses.
  */
 class Connective
 {
@@ -35,6 +35,8 @@ public function __construct(
     }
 
     /**
+     * Get operator
+     *
      * @return Operator
      */
     public function getOperator()
@@ -43,6 +45,8 @@ public function getOperator()
     }
 
     /**
+     * Get condition
+     *
      * @return Connective[]|Clause[]
      */
     public function getConditions()
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Find/ConnectiveFactory.php b/lib/internal/Magento/Framework/GraphQl/Argument/Find/ConnectiveFactory.php
@@ -8,7 +8,7 @@
 use Magento\Framework\ObjectManagerInterface;
 
 /**
- * Factory for Connective Class
+ * Factory for @see Connective class
  */
 class ConnectiveFactory
 {
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Find/FindArgumentValue.php b/lib/internal/Magento/Framework/GraphQl/Argument/Find/FindArgumentValue.php
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Find/FindArgumentValueFactory.php b/lib/internal/Magento/Framework/GraphQl/Argument/Find/FindArgumentValueFactory.php
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/Find/FindArgumentValueInterface.php b/lib/internal/Magento/Framework/GraphQl/Argument/Find/FindArgumentValueInterface.php
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplierFactory.php b/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplierFactory.php
diff --git a/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/FilterGroupFactory.php b/lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/FilterGroupFactory.php
diff --git a/lib/internal/Magento/Framework/GraphQl/ExceptionFormatter.php b/lib/internal/Magento/Framework/GraphQl/ExceptionFormatter.php
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/Type.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/Type.php
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/SchemaFactory.php b/lib/internal/Magento/Framework/GraphQl/Type/SchemaFactory.php
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Type/TypeFactory.php

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ public function dispatch(RequestInterface $request)`
`92`	`92`	`);`
`93`	`93`	`} catch (\Exception $error) {`
`94`	`94`	`$result['extensions']['exception'] = $this->graphQlError->create($error);`
`95`		`- $this->response->setStatusCode(500);`
`96`	`95`	`}`
`97`	`96`	`$this->response->setBody($this->jsonSerializer->serialize($result))->setHeader(`
`98`	`97`	`'Content-Type',`