Merge pull request #57 from tddwizard/address-builder-extension-fix-conflicts

Resolve conflicts after refactoring

Author: schmengler

src/Customer/AddressBuilder.php

@@ -9,6 +9,7 @@
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Directory\Model\Region;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -47,13 +48,10 @@ public static function anAddress(
     }
 
     public static function aCompanyAddress(
-        ObjectManagerInterface $objectManager = null,
         string $locale = 'de_DE',
         string $vatId = '1234567890'
     ): AddressBuilder {
-        if ($objectManager === null) {
-            $objectManager = Bootstrap::getObjectManager();
-        }
+        $objectManager = Bootstrap::getObjectManager();
 
         $address = self::prepareFakeAddress($objectManager, $locale);
         $address->setVatId($vatId);

tests/Customer/CustomerBuilderTest.php

@@ -176,7 +176,7 @@ public function testCompanyAddress(): void
         $vatId = '1112223334';
         $customerFixture = new CustomerFixture(
             CustomerBuilder::aCustomer()->withAddresses(
-                AddressBuilder::aCompanyAddress(null, 'de_DE', $vatId)->asDefaultBilling()
+                AddressBuilder::aCompanyAddress('de_DE', $vatId)->asDefaultBilling()
             )->build()
         );