magento/graphql-ce#893 improved strict typing in SelectedShippingMethod

Author: Vaha

app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php

@@ -31,8 +31,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         /** @var Address $address */
         $address = $value['model'];
         $rates = $address->getAllShippingRates();
-        $carrierTitle = null;
-        $methodTitle = null;
+        $carrierTitle = '';
+        $methodTitle = '';
 
         if (count($rates) > 0 && !empty($address->getShippingMethod())) {
             list($carrierCode, $methodCode) = explode('_', $address->getShippingMethod(), 2);
@@ -65,12 +65,18 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             ];
         } else {
             $data = [
-                'carrier_code' => null,
-                'method_code' => null,
+                'carrier_code' => '',
+                'method_code' => '',
                 'carrier_title' => $carrierTitle,
                 'method_title' => $methodTitle,
-                'amount' => null,
-                'base_amount' => null,
+                'amount' => [
+                    'value' => null,
+                    'currency' => null,
+                ],
+                'base_amount' => [
+                    'value' => null,
+                    'currency' => null,
+                ],
             ];
         }
         return $data;

app/code/Magento/QuoteGraphQl/etc/schema.graphqls

@@ -239,12 +239,12 @@ type CartAddressCountry {
 }
 
 type SelectedShippingMethod {
-    carrier_code: String
-    method_code: String
-    carrier_title: String
-    method_title: String
-    amount: Money
-    base_amount: Money
+    carrier_code: String!
+    method_code: String!
+    carrier_title: String!
+    method_title: String!
+    amount: Money!
+    base_amount: Money!
 }
 
 type AvailableShippingMethod {

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php

@@ -110,16 +110,16 @@ public function testGetSelectedShippingMethodBeforeSet()
         self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
 
         self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['carrier_code']);
 
         self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['method_code']);
 
         self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-        self::assertNull($shippingAddress['selected_shipping_method']['carrier_title']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['carrier_title']);
 
         self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-        self::assertNull($shippingAddress['selected_shipping_method']['method_title']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['method_title']);
     }
 
     /**
@@ -183,12 +183,18 @@ public function testGetGetSelectedShippingMethodIfShippingMethodIsNotSet()
         $shippingAddress = current($response['cart']['shipping_addresses']);
         self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
 
-        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
-        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
-        self::assertNull($shippingAddress['selected_shipping_method']['carrier_title']);
-        self::assertNull($shippingAddress['selected_shipping_method']['method_title']);
-        self::assertNull($shippingAddress['selected_shipping_method']['amount']);
-        self::assertNull($shippingAddress['selected_shipping_method']['base_amount']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['carrier_code']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['method_code']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['carrier_title']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['method_title']);
+
+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
+        self::assertNull($shippingAddress['selected_shipping_method']['amount']['value']);
+        self::assertNull($shippingAddress['selected_shipping_method']['amount']['currency']);
+
+        self::assertArrayHasKey('base_amount', $shippingAddress['selected_shipping_method']);
+        self::assertNull($shippingAddress['selected_shipping_method']['base_amount']['value']);
+        self::assertNull($shippingAddress['selected_shipping_method']['base_amount']['currency']);
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php

@@ -101,16 +101,16 @@ public function testGetSelectedShippingMethodBeforeSet()
         self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
 
         self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['carrier_code']);
 
         self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['method_code']);
 
         self::assertArrayHasKey('carrier_title', $shippingAddress['selected_shipping_method']);
-        self::assertNull($shippingAddress['selected_shipping_method']['carrier_title']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['carrier_title']);
 
         self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-        self::assertNull($shippingAddress['selected_shipping_method']['method_title']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['method_title']);
     }
 
     /**
@@ -153,12 +153,18 @@ public function testGetGetSelectedShippingMethodIfShippingMethodIsNotSet()
         $shippingAddress = current($response['cart']['shipping_addresses']);
         self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
 
-        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
-        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
-        self::assertNull($shippingAddress['selected_shipping_method']['carrier_title']);
-        self::assertNull($shippingAddress['selected_shipping_method']['method_title']);
-        self::assertNull($shippingAddress['selected_shipping_method']['amount']);
-        self::assertNull($shippingAddress['selected_shipping_method']['base_amount']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['carrier_code']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['method_code']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['carrier_title']);
+        self::assertEmpty($shippingAddress['selected_shipping_method']['method_title']);
+
+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
+        self::assertNull($shippingAddress['selected_shipping_method']['amount']['value']);
+        self::assertNull($shippingAddress['selected_shipping_method']['amount']['currency']);
+
+        self::assertArrayHasKey('base_amount', $shippingAddress['selected_shipping_method']);
+        self::assertNull($shippingAddress['selected_shipping_method']['base_amount']['value']);
+        self::assertNull($shippingAddress['selected_shipping_method']['base_amount']['currency']);
     }
 
     /**