GraphQL-418: [Shipping methods] Set Shipping Methods on Cart

magento · Mar 5, 2019 · a13639c · a13639c
1 parent 8b2106a
commit a13639c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 deletions.
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
@@ -12,7 +12,6 @@
             <module name="Magento_ConfigurableProduct"/>
             <module name="Magento_GraphQl"/>
             <module name="Magento_CatalogGraphQl"/>
-            <module name="Magento_QuoteGraphQl"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -101,10 +101,6 @@ input ShippingMethodInput {
     cart_address_id: Int!
     carrier_code: String!
     method_code: String!
-    additional_data: ShippingMethodAdditionalDataInput
-}
-
-input ShippingMethodAdditionalDataInput {
 }
 
 input SetPaymentMethodOnCartInput {
@@ -115,10 +111,6 @@ input SetPaymentMethodOnCartInput {
 input PaymentMethodInput {
     code: String! @doc(description:"Payment method code")
     purchase_order_number: String @doc(description:"Purchase order number")
-    additional_data: PaymentMethodAdditionalDataInput
-}
-
-input PaymentMethodAdditionalDataInput {
 }
 
 type SetPaymentMethodOnCartOutput {
@@ -189,10 +181,6 @@ type SelectedShippingMethod {
     method_code: String
     label: String
     amount: Float
-    additional_data: SelectedShippingMethodAdditionalData
-}
-
-type SelectedShippingMethodAdditionalData {
 }
 
 type AvailableShippingMethod {
@@ -215,10 +203,6 @@ type AvailablePaymentMethod {
 type SelectedPaymentMethod {
     code: String @doc(description: "The payment method code")
     purchase_order_number: String @doc(description: "The purchase order number.")
-    additional_data: SelectedPaymentMethodAdditionalData
-}
-
-type SelectedPaymentMethodAdditionalData {
 }
 
 enum AdressTypeEnum {

diff --git a/.../api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/.../api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -122,6 +122,7 @@ public function testSetMultipleShippingMethods()
      * @param string $shippingCarrierCode
      * @param string $shippingAddressId
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function prepareMutationQuery(
         string $maskedQuoteId,
@@ -163,6 +164,7 @@ private function prepareMutationQuery(
     /**
      * @param string $reversedQuoteId
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
     {
@@ -176,6 +178,7 @@ private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): str
      * @param string $reversedQuoteId
      * @param int $customerId
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function assignQuoteToCustomer(
         string $reversedQuoteId,
@@ -192,6 +195,7 @@ private function assignQuoteToCustomer(
      * @param string $username
      * @param string $password
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
     {

diff --git a/...sts/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/...sts/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -115,6 +115,7 @@ public function testSetMultipleShippingMethods()
      * @param string $shippingCarrierCode
      * @param string $shippingAddressId
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function prepareMutationQuery(
         string $maskedQuoteId,
@@ -154,6 +155,7 @@ private function prepareMutationQuery(
     /**
      * @param string $reversedQuoteId
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
     {

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 use Magento\Framework\App\Config\Storage\Writer;
 use Magento\Framework\App\Config\Storage\WriterInterface;

diff --git a/...ts/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods_rollback.php b/...ts/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods_rollback.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 use Magento\Framework\App\Config\Storage\Writer;
 use Magento\Framework\App\Config\Storage\WriterInterface;

diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $resource = $objectManager->get(\Magento\Framework\App\ResourceConnection::class);

diff --git a/...tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight_rollback.php b/...tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight_rollback.php
@@ -3,5 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 require 'tablerates_rollback.php';