Assert creation of billing

Sylius · Jun 15, 2021 · 86ecbe2 · 86ecbe2
1 parent 1576c43
commit 86ecbe2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/Factory/CustomerBillingDataFactory.php b/src/Factory/CustomerBillingDataFactory.php
@@ -16,6 +16,7 @@
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Sylius\RefundPlugin\Entity\CustomerBillingDataInterface;
+use Webmozart\Assert\Assert;
 
 class CustomerBillingDataFactory implements CustomerBillingDataFactoryInterface
 {
@@ -63,6 +64,13 @@ public function createWithData(
 
     public function createWithAddress(AddressInterface $address): CustomerBillingDataInterface
     {
+        Assert::notNull($address->getFirstName());
+        Assert::notNull($address->getLastName());
+        Assert::notNull($address->getStreet());
+        Assert::notNull($address->getPostcode());
+        Assert::notNull($address->getCountryCode());
+        Assert::notNull($address->getCity());
+
         return $this->createWithData(
             $address->getFirstName(),
             $address->getLastName(),

diff --git a/src/Generator/CreditMemoGenerator.php b/src/Generator/CreditMemoGenerator.php
@@ -94,12 +94,6 @@ public function generate(
 
     private function getFromAddress(AddressInterface $address): CustomerBillingDataInterface
     {
-        Assert::notNull($address->getFirstName());
-        Assert::notNull($address->getLastName());
-        Assert::notNull($address->getStreet());
-        Assert::notNull($address->getPostcode());
-        Assert::notNull($address->getCountryCode());
-
         return $this->customerBillingDataFactory->createWithAddress($address);
     }
 

diff --git a/src/Resources/config/app/config.yml b/src/Resources/config/app/config.yml
@@ -22,7 +22,6 @@ sylius_resource:
         sylius_refund.customer_billing_data:
             classes:
                 model: Sylius\RefundPlugin\Entity\CustomerBillingData
-                factory: Sylius\RefundPlugin\Factory\CustomerBillingDataFactory
 
 sylius_mailer:
     emails: