ENGCOM-5734: Upgrade graphql-php to v0.13.6 #844

magento-engcom-team · magento-engcom-team · commit 065b7f7e7d9c · 2019-09-09T12:12:16.000-05:00
- Merge Pull Request magento/graphql-ce#844 from pmclain/graphql-ce:issue/777 - Merged commits: 1. f30bb79 2. d504472 3. fe9d262 4. 9b2297a 5. fac2081
diff --git a/composer.json b/composer.json
@@ -52,7 +52,7 @@
         "symfony/process": "~4.1.0|~4.2.0|~4.3.0",
         "tedivm/jshrink": "~1.3.0",
         "tubalmartin/cssmin": "4.1.1",
-        "webonyx/graphql-php": "^0.12.6",
+        "webonyx/graphql-php": "^0.13.6",
         "zendframework/zend-captcha": "^2.7.1",
         "zendframework/zend-code": "~3.3.0",
         "zendframework/zend-config": "^2.6.0",
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -303,8 +303,8 @@ public function invalidInputDataProvider()
     {
         return [
             ['', 'Syntax Error: Expected Name, found )'],
-            ['input: ""', 'Expected type CustomerAddressInput!, found "".'],
-            ['input: "foo"', 'Expected type CustomerAddressInput!, found "foo".']
+            ['input: ""', 'requires type CustomerAddressInput!, found "".'],
+            ['input: "foo"', 'requires type CustomerAddressInput!, found "foo".']
         ];
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -306,8 +306,8 @@ public function invalidInputDataProvider()
     {
         return [
             ['', '"input" value must be specified'],
-            ['input: ""', 'Expected type CustomerAddressInput, found ""'],
-            ['input: "foo"', 'Expected type CustomerAddressInput, found "foo"']
+            ['input: ""', 'requires type CustomerAddressInput, found ""'],
+            ['input: "foo"', 'requires type CustomerAddressInput, found "foo"']
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -251,7 +251,7 @@ public function testError() : void
                 foreach ($outputResponse['errors'] as $error) {
                     $this->assertEquals(
                         \Magento\Framework\GraphQl\Exception\GraphQlInputException::EXCEPTION_CATEGORY,
-                        $error['category']
+                        $error['extensions']['category']
                     );
                     if (isset($error['message'])) {
                         $this->assertEquals($error['message'], 'Invalid entity_type specified: invalid');
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressTokenTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressTokenTest.php
@@ -136,7 +136,7 @@ public function testResolveWithPaypalError($paymentMethod): void
         $this->assertArrayHasKey('errors', $responseData);
         $actualError = $responseData['errors'][0];
         $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 
     /**
@@ -173,7 +173,7 @@ public function testResolveWithInvalidRedirectUrl($paymentMethod): void
         $this->assertArrayHasKey('errors', $responseData);
         $actualError = $responseData['errors'][0];
         $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenExceptionTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenExceptionTest.php
@@ -73,6 +73,6 @@ public function testResolveWithPaypalError(): void
         $this->assertArrayHasKey('errors', $responseData);
         $actualError = $responseData['errors'][0];
         $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProTokenTest.php
@@ -130,6 +130,6 @@ public function testResolveWithInvalidRedirectUrl(): void
         $this->assertArrayHasKey('errors', $responseData);
         $actualError = $responseData['errors'][0];
         $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithHostedProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithHostedProTest.php
@@ -206,7 +206,7 @@ public function testOrderWithHostedProDeclined(): void
         $this->assertArrayHasKey('errors', $responseData);
         $actualError = $responseData['errors'][0];
         $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 
     /**
@@ -258,6 +258,6 @@ public function testSetPaymentMethodInvalidUrls()
         $this->assertArrayHasKey('errors', $responseData);
         $actualError = $responseData['errors'][0];
         $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
@@ -273,6 +273,6 @@ public function testResolveWithPayflowLinkDeclined(): void
             $expectedExceptionMessage,
             $actualError['message']
         );
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php
@@ -178,7 +178,7 @@ public function testResolvePaymentsAdvancedWithInvalidUrl(): void
         $this->assertArrayHasKey('errors', $responseData);
         $actualError = $responseData['errors'][0];
         $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 
     /**
@@ -230,7 +230,7 @@ public function testResolveWithPaymentAdvancedDeclined(): void
         $this->assertArrayHasKey('errors', $responseData);
         $actualError = $responseData['errors'][0];
         $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/SetPaymentMethodAsPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/SetPaymentMethodAsPayflowLinkTest.php
@@ -168,6 +168,6 @@ public function testInvalidUrl(): void
         $expectedExceptionMessage = "Invalid Url.";
         $actualError = $responseData['errors'][0];
         $this->assertEquals($expectedExceptionMessage, $actualError['message']);
-        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);
+        $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/ResolveInfoFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ResolveInfoFactory.php
@@ -7,11 +7,27 @@
 
 namespace Magento\Framework\GraphQl\Schema\Type;
 
+use Magento\Framework\ObjectManagerInterface;
+
 /**
  * Factory for wrapper of GraphQl ResolveInfo
  */
 class ResolveInfoFactory
 {
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
     /**
      * Create a wrapper resolver info from the instance of the library object
      *
@@ -25,6 +41,6 @@ public function create(\GraphQL\Type\Definition\ResolveInfo $info) : ResolveInfo
             $values[$key] = $value;
         }
 
-        return new ResolveInfo($values);
+        return $this->objectManager->create(ResolveInfo::class, $values);
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/ScalarTypes.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/ScalarTypes.php
@@ -13,25 +13,29 @@
 class ScalarTypes
 {
     /**
+     * Check if type is scalar
+     *
      * @param string $typeName
      * @return bool
      */
     public function isScalarType(string $typeName) : bool
     {
-        $internalTypes = \GraphQL\Type\Definition\Type::getInternalTypes();
-        return isset($internalTypes[$typeName]) ? true : false;
+        $standardTypes = \GraphQL\Type\Definition\Type::getStandardTypes();
+        return isset($standardTypes[$typeName]) ? true : false;
     }
 
     /**
+     * Get instance of scalar type
+     *
      * @param string $typeName
      * @return \GraphQL\Type\Definition\ScalarType|\GraphQL\Type\Definition\Type
      * @throws \LogicException
      */
     public function getScalarTypeInstance(string $typeName) : \GraphQL\Type\Definition\Type
     {
-        $internalTypes = \GraphQL\Type\Definition\Type::getInternalTypes();
+        $standardTypes = \GraphQL\Type\Definition\Type::getStandardTypes();
         if ($this->isScalarType($typeName)) {
-            return $internalTypes[$typeName];
+            return $standardTypes[$typeName];
         } else {
             throw new \LogicException(sprintf('Scalar type %s doesn\'t exist', $typeName));
         }

Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,8 @@ public function invalidInputDataProvider()`
`303`	`303`	`{`
`304`	`304`	`return [`
`305`	`305`	`['', 'Syntax Error: Expected Name, found )'],`
`306`		`- ['input: ""', 'Expected type CustomerAddressInput!, found "".'],`
`307`		`- ['input: "foo"', 'Expected type CustomerAddressInput!, found "foo".']`
	`306`	`+ ['input: ""', 'requires type CustomerAddressInput!, found "".'],`
	`307`	`+ ['input: "foo"', 'requires type CustomerAddressInput!, found "foo".']`
`308`	`308`	`];`
`309`	`309`	`}`
`310`	`310`
Original file line number	Diff line number	Diff line change
`@@ -306,8 +306,8 @@ public function invalidInputDataProvider()`
`306`	`306`	`{`
`307`	`307`	`return [`
`308`	`308`	`['', '"input" value must be specified'],`
`309`		`- ['input: ""', 'Expected type CustomerAddressInput, found ""'],`
`310`		`- ['input: "foo"', 'Expected type CustomerAddressInput, found "foo"']`
	`309`	`+ ['input: ""', 'requires type CustomerAddressInput, found ""'],`
	`310`	`+ ['input: "foo"', 'requires type CustomerAddressInput, found "foo"']`
`311`	`311`	`];`
`312`	`312`	`}`
`313`	`313`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,6 @@ public function testResolveWithPaypalError(): void`
`73`	`73`	`$this->assertArrayHasKey('errors', $responseData);`
`74`	`74`	`$actualError = $responseData['errors'][0];`
`75`	`75`	`$this->assertEquals($expectedExceptionMessage, $actualError['message']);`
`76`		`- $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);`
	`76`	`+ $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,6 @@ public function testResolveWithInvalidRedirectUrl(): void`
`130`	`130`	`$this->assertArrayHasKey('errors', $responseData);`
`131`	`131`	`$actualError = $responseData['errors'][0];`
`132`	`132`	`$this->assertEquals($expectedExceptionMessage, $actualError['message']);`
`133`		`- $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);`
	`133`	`+ $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public function testOrderWithHostedProDeclined(): void`
`206`	`206`	`$this->assertArrayHasKey('errors', $responseData);`
`207`	`207`	`$actualError = $responseData['errors'][0];`
`208`	`208`	`$this->assertEquals($expectedExceptionMessage, $actualError['message']);`
`209`		`- $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);`
	`209`	`+ $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`/**`
`@@ -258,6 +258,6 @@ public function testSetPaymentMethodInvalidUrls()`
`258`	`258`	`$this->assertArrayHasKey('errors', $responseData);`
`259`	`259`	`$actualError = $responseData['errors'][0];`
`260`	`260`	`$this->assertEquals($expectedExceptionMessage, $actualError['message']);`
`261`		`- $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);`
	`261`	`+ $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);`
`262`	`262`	`}`
`263`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,6 @@ public function testResolveWithPayflowLinkDeclined(): void`
`273`	`273`	`$expectedExceptionMessage,`
`274`	`274`	`$actualError['message']`
`275`	`275`	`);`
`276`		`- $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['category']);`
	`276`	`+ $this->assertEquals(GraphQlInputException::EXCEPTION_CATEGORY, $actualError['extensions']['category']);`
`277`	`277`	`}`
`278`	`278`	`}`