MAGETWO-83855: Create wrapper for resolver info

- solving wrappers types

Author: cpartica

app/code/Magento/GraphQl/Model/Type/Handler/Pool.php

@@ -6,9 +6,9 @@
 
 namespace Magento\GraphQl\Model\Type\Handler;
 
-use Magento\Framework\GraphQl\Type\Definition\ObjectType;
 use Magento\Framework\GraphQl\Type\Definition\TypeInterface;
 use Magento\GraphQl\Model\Type\HandlerFactory;
+use Magento\Framework\GraphQl\Type\Definition\ScalarTypeFactory;
 
 /**
  * Retrieve type's registered in pool, or generate types yet to be instantiated and register them
@@ -27,27 +27,33 @@ class Pool
 
     /**
      * @param HandlerFactory $typeHandlerFactory
+     * @param ScalarTypeFactory $scalarTypeFactory
      */
-    public function __construct(\Magento\GraphQl\Model\Type\HandlerFactory $typeHandlerFactory)
-    {
+    public function __construct(
+        HandlerFactory $typeHandlerFactory,
+        ScalarTypeFactory $scalarTypeFactory
+    ) {
         $this->typeHandlerFactory = $typeHandlerFactory;
+        $this->scalarTypeFactory = $scalarTypeFactory;
     }
 
     /**
      * @param string $typeName
-     * @return TypeInterface
+     * @return TypeInterface|\GraphQL\Type\Definition\Type
+     * @throws \LogicException
      */
     public function getType(string $typeName)
     {
-        if ($type = $this->mapScalarType($typeName)) {
-            return $type;
+        if (isset($this->typeRegistry[$typeName])) {
+            return $this->typeRegistry[$typeName];
         }
 
-        if ($type = $this->getComplexType($typeName)) {
-            return $type;
+        if ($this->scalarTypeFactory->typeExists($typeName)) {
+            $this->typeRegistry[$typeName] = $this->scalarTypeFactory->create($typeName);
+            return $this->typeRegistry[$typeName];
+        } else {
+            return $this->getComplexType($typeName);
         }
-
-        throw new \LogicException(sprintf('%s type could not be resolved or generated.', $typeName));
     }
 
     /**
@@ -97,28 +103,4 @@ public function isTypeRegistered(string $typeName)
     {
         return isset($this->typeRegistry[$typeName]);
     }
-
-    /**
-     * Map type name to scalar GraphQL type, otherwise return null
-     *
-     * @param string $typeName
-     * @return TypeInterface|null
-     */
-    private function mapScalarType($typeName)
-    {
-        $scalarTypes = $this->getInternalTypes();
-
-        return isset($scalarTypes[$typeName]) ? $scalarTypes[$typeName] : null;
-    }
-
-    /**
-     * Get all internal scalar types
-     *
-     * @return array
-     */
-    private function getInternalTypes()
-    {
-        $object = new ObjectType(['name' => 'fake', 'fields' => 'fake']);
-        return $object->getInternalTypes();
-    }
 }

lib/internal/Magento/Framework/GraphQl/Argument/SearchCriteria/ArgumentApplierFactory.php

@@ -32,6 +32,7 @@ public function __construct(
      *
      * @param string $argumentName
      * @return ArgumentApplierInterface
+     * @throws \LogicException
      */
     public function create(string $argumentName)
     {
@@ -41,6 +42,10 @@ public function create(string $argumentName)
             'currentPage' => ArgumentApplier\CurrentPage::class,
             'sort' => ArgumentApplier\Sort::class
         ];
-        return $this->objectManager->create($appliers[$argumentName]);
+        if (isset($appliers[$argumentName])) {
+            return $this->objectManager->create($appliers[$argumentName]);
+        } else {
+            throw new \LogicException(sprintf('Applier %s not found', $argumentName));
+        }
     }
 }

lib/internal/Magento/Framework/GraphQl/Executor.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\GraphQl\Type\Definition;
+
+/**
+ * Wrapper for GraphQl BooleanType
+ */
+class BooleanType extends \GraphQL\Type\Definition\BooleanType implements ScalarTypeInterface
+{
+
+}

lib/internal/Magento/Framework/GraphQl/Type/Definition/BooleanType.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\GraphQl\Type\Definition;
+
+/**
+ * Wrapper for GraphQl FloatType
+ */
+class FloatType extends \GraphQL\Type\Definition\FloatType implements ScalarTypeInterface
+{
+
+}

lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\GraphQl\Type\Definition;
+
+/**
+ * Wrapper for GraphQl IdType
+ */
+class IdType extends \GraphQL\Type\Definition\IdType implements ScalarTypeInterface
+{
+
+}

lib/internal/Magento/Framework/GraphQl/Type/Definition/IdType.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\GraphQl\Type\Definition;
+
+/**
+ * Wrapper for GraphQl IntType
+ */
+class IntType extends \GraphQL\Type\Definition\IntType implements ScalarTypeInterface
+{
+
+}

lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php

@@ -9,7 +9,7 @@
 /**
  * Wrapper for GraphQl ResolveInfo
  */
-class ResolveInfo extends \GraphQL\Type\Definition\ResolveInfo implements TypeInterface
+class ResolveInfo extends \GraphQL\Type\Definition\ResolveInfo
 {
 
 }

lib/internal/Magento/Framework/GraphQl/Type/Definition/ResolveInfo.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\GraphQl\Type\Definition;
+
+/**
+ * Factory class for the creation scalar types
+ */
+class ScalarTypeFactory
+{
+    /**
+     * Create a scalar type
+     *
+     * @param string $typeName
+     * @return \GraphQL\Type\Definition\Type
+     * @throws \LogicException
+     */
+    public function create(string $typeName)
+    {
+        $types = \GraphQL\Type\Definition\Type::getInternalTypes();
+        if (isset($types[$typeName])) {
+            return $types[$typeName];
+        } else {
+            throw new \LogicException(sprintf('Scalar type %s not found', $typeName));
+        }
+    }
+
+    /**
+     * Checks if a scalar type exists
+     *
+     * @param string $typeName
+     * @return bool
+     */
+    public function typeExists(string $typeName)
+    {
+        $types = \GraphQL\Type\Definition\Type::getInternalTypes();
+        if (isset($types[$typeName])) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}

lib/internal/Magento/Framework/GraphQl/Type/Definition/ScalarTypeFactory.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\GraphQl\Type\Definition;
+
+/**
+ * Interface for GraphQl Scalar Type
+ */
+interface ScalarTypeInterface extends TypeInterface
+{
+
+}