From b2a21ede77296e921f2c43833e3de85004d6e9d3 Mon Sep 17 00:00:00 2001
From: Patrick McLain <pat@pmclain.com>
Date: Fri, 23 Aug 2019 23:54:42 -0400
Subject: [PATCH] Fix static test and remove unused import

---
 .../Model/Cart/ExtractQuoteAddressData.php    | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
index ce14bcf2d71ea..27dd1959cb5d7 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
@@ -7,7 +7,6 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Customer\Model\Address\AbstractAddress;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
@@ -41,19 +40,22 @@ public function execute(QuoteAddress $address): array
         $addressData = $this->dataObjectConverter->toFlatArray($address, [], AddressInterface::class);
         $addressData['model'] = $address;
 
-        $addressData = array_merge($addressData, [
-            'country' => [
-                'code' => $address->getCountryId(),
-                'label' => $address->getCountry()
-            ],
-            'region' => [
-                'code' => $address->getRegionCode(),
-                'label' => $address->getRegion()
-            ],
-            'street' => $address->getStreet(),
-            'items_weight' => $address->getWeight(),
-            'customer_notes' => $address->getCustomerNotes()
-        ]);
+        $addressData = array_merge(
+            $addressData,
+            [
+                'country' => [
+                    'code' => $address->getCountryId(),
+                    'label' => $address->getCountry()
+                ],
+                'region' => [
+                    'code' => $address->getRegionCode(),
+                    'label' => $address->getRegion()
+                ],
+                'street' => $address->getStreet(),
+                'items_weight' => $address->getWeight(),
+                'customer_notes' => $address->getCustomerNotes()
+            ]
+        );
 
         if (!$address->hasItems()) {
             return $addressData;