Fix tests (#21)

lruozzi9 · lruozzi9 · commit 7abf07d4db02 · 2026-02-10T16:34:21.000+01:00
diff --git a/composer.json b/composer.json
@@ -81,12 +81,6 @@
             }
         }
     },
-    "repositories": {
-        "sandwich/vies-bundle": {
-            "type": "git",
-            "url": "https://github.com/mmenozzi/ViesBundle.git"
-        }
-    },
     "autoload": {
         "psr-4": {
             "Webgriffe\\SyliusItalianInvoiceableOrderPlugin\\": "src/"
diff --git a/features/checkout/invoiceable_address_book/having_new_invoiceable_address_saved_in_address_book.feature b/features/checkout/invoiceable_address_book/having_new_invoiceable_address_saved_in_address_book.feature
@@ -1,40 +1,40 @@
 @invoiceable_address_book
 Feature: Having new invoiceable addresses saved in the address book after checkout
-  In order to ease my address management
-  As a Customer
-  I want new invoiceable addresses provided during checkout to be saved in my address book
+    In order to ease my address management
+    As a Customer
+    I want new invoiceable addresses provided during checkout to be saved in my address book
 
-  Background:
-    Given the store operates on a single channel in "Italy"
-    And the store has a product "Lannister Coat" priced at "$19.99"
-    And the store ships everywhere for free
-    And the store allows paying with "Cash on Delivery"
-    And I am a logged in customer
-    And I added product "Lannister Coat" to the cart
+    Background:
+        Given the store operates on a single channel in "Italy"
+        And the store has a product "Lannister Coat" priced at "$19.99"
+        And the store ships everywhere for free
+        And the store allows paying with "Cash on Delivery"
+        And I am a logged in customer
+        And I added product "Lannister Coat" to the cart
 
-  @ui
-  Scenario: Invoiceable address already existent in my book don't get saved again
-    Given I have an address for the company "GoT SpA" - "Jon Snow" - "Viale Italia", "42100", "Reggio Emilia" - "Italy"
-    And this address has also all the invoiceable information valid for an italian company
-    And I am at the checkout addressing step
-    When I specify the billing address for the company "GoT SpA" - "Jon Snow" - "Viale Italia", "42100", "Reggio Emilia" - "Italy"
-    And I specify the same invoiceable information of the address I have in my address book
-    And I complete the addressing step
-    And I proceed with "Free" shipping method and "Cash on Delivery" payment
-    And I confirm my order
-    And I should see the thank you page
-    Then I should have a single address in my address book
+    @ui
+    Scenario: Invoiceable address already existent in my book don't get saved again
+        Given I have an address for the company "GoT SpA" - "Jon Snow" - "Viale Italia", "42100", "Reggio Emilia" - "Italy"
+        And this address has also all the invoiceable information valid for an italian company
+        And I am at the checkout addressing step
+        When I specify the billing address for the company "GoT SpA" - "Jon Snow" - "Viale Italia", "42100", "Reggio Emilia" - "Italy"
+        And I specify the same invoiceable information of the address I have in my address book
+        And I complete the addressing step
+        And I proceed with "Free" shipping method and "Cash on Delivery" payment
+        And I confirm my order
+        And I should see the thank you page
+        Then I should have a single address in my address book
 
-  @ui
-  Scenario: Different invoiceable address information provided during checkout are saved in my book as new address
-    Given I have an address for the company "GoT SpA" - "Jon Snow" - "Viale Italia", "42100", "Reggio Emilia" - "Italy"
-    And this address has also all the invoiceable information valid for an italian company
-    And I am at the checkout addressing step
-    When I specify the billing address for the company "GoT SpA" - "Jon Snow" - "Viale Italia", "42100", "Reggio Emilia" - "Italy"
-    And I specify the same invoiceable information of the address I have in my address book
-    But I specify a different SDI code from that of the address I have in the address book
-    And I complete the addressing step
-    And I proceed with "Free" shipping method and "Cash on Delivery" payment
-    And I confirm my order
-    And I should see the thank you page
-    Then I should have 2 addresses in my address book
+    @ui
+    Scenario: Different invoiceable address information provided during checkout are saved in my book as new address
+        Given I have an address for the company "GoT SpA" - "Jon Snow" - "Viale Italia", "42100", "Reggio Emilia" - "Italy"
+        And this address has also all the invoiceable information valid for an italian company
+        And I am at the checkout addressing step
+        When I specify the billing address for the company "GoT SpA" - "Jon Snow" - "Viale Italia", "42100", "Reggio Emilia" - "Italy"
+        And I specify the same invoiceable information of the address I have in my address book
+        But I specify a different SDI code from that of the address I have in the address book
+        And I complete the addressing step
+        And I proceed with "Free" shipping method and "Cash on Delivery" payment
+        And I confirm my order
+        And I should see the thank you page
+        Then I should have 2 addresses in my address book
diff --git a/features/checkout/tax_calculation/applying_correct_taxes_based_on_customer.feature b/features/checkout/tax_calculation/applying_correct_taxes_based_on_customer.feature
@@ -1,89 +1,89 @@
 @applying_taxes
 Feature: Apply correct taxes based on order address
-  In order to pay proper amount when buying goods
-  As a Customer or Visitor
-  I want to have correct taxes applied to my order
+    In order to pay proper amount when buying goods
+    As a Customer or Visitor
+    I want to have correct taxes applied to my order
 
-  Background:
-    Given the store operates on a single channel worldwide
-    And the store uses the "Italian tax calculation strategy" tax calculation strategy
-    And there is a tax zone "EU" containing all European Union countries
-    And there is a tax zone "Extra EU" containing all countries outside the European Union
-    And there is a shipping zone "Global" containing all countries of the world
-    And the store ships everywhere for Free
-    And the store allows paying Offline
-    And the store has "IVA 22%" tax rate of 22% for "IVA Ordinaria" within the "EU" zone
-    And the store has a product "PHP T-Shirt" priced at "$100.00"
-    And it belongs to "IVA Ordinaria" tax category
+    Background:
+        Given the store operates on a single channel worldwide
+        And the store uses the "Italian tax calculation strategy" tax calculation strategy
+        And there is a tax zone "EU" containing all European Union countries
+        And there is a tax zone "Extra EU" containing all countries outside the European Union
+        And there is a shipping zone "Global" containing all countries of the world
+        And the store ships everywhere for Free
+        And the store allows paying Offline
+        And the store has "IVA 22%" tax rate of 22% for "IVA Ordinaria" within the "EU" zone
+        And the store has a product "PHP T-Shirt" priced at "$100.00"
+        And it belongs to "IVA Ordinaria" tax category
 
-  @ui
-  Scenario: Paying taxes while ordering as an italian individual
-    Given I added product "PHP T-Shirt" to the cart
-    And I am at the checkout addressing step
-    And I specify the email as "italian-individual@email.com"
-    And I specify a valid italian individual billing address
-    And I complete the addressing step
-    And I proceed with "Free" shipping method and "Offline" payment
-    Then I should be on the checkout complete step
-    And my order total should be "$122.00"
-    And my tax total should be "$22.00"
+    @ui
+    Scenario: Paying taxes while ordering as an italian individual
+        Given I added product "PHP T-Shirt" to the cart
+        And I am at the checkout addressing step
+        And I specify the email as "italian-individual@email.com"
+        And I specify a valid italian individual billing address
+        And I complete the addressing step
+        And I proceed with "Free" shipping method and "Offline" payment
+        Then I should be on the checkout complete step
+        And my order total should be "$122.00"
+        And my tax total should be "$22.00"
 
-  @ui
-  Scenario: Paying taxes while ordering as an italian company
-    Given I added product "PHP T-Shirt" to the cart
-    And I am at the checkout addressing step
-    And I specify the email as "italian-company@email.com"
-    And I specify a valid italian company billing address
-    And I complete the addressing step
-    And I proceed with "Free" shipping method and "Offline" payment
-    Then I should be on the checkout complete step
-    And my order total should be "$122.00"
-    And my tax total should be "$22.00"
+    @ui
+    Scenario: Paying taxes while ordering as an italian company
+        Given I added product "PHP T-Shirt" to the cart
+        And I am at the checkout addressing step
+        And I specify the email as "italian-company@email.com"
+        And I specify a valid italian company billing address
+        And I complete the addressing step
+        And I proceed with "Free" shipping method and "Offline" payment
+        Then I should be on the checkout complete step
+        And my order total should be "$122.00"
+        And my tax total should be "$22.00"
 
-  @ui
-  Scenario: Paying taxes while ordering as an EU individual
-    Given I added product "PHP T-Shirt" to the cart
-    And I am at the checkout addressing step
-    And I specify the email as "german-individual@email.com"
-    And I specify a valid german individual billing address
-    And I complete the addressing step
-    And I proceed with "Free" shipping method and "Offline" payment
-    Then I should be on the checkout complete step
-    And my order total should be "$122.00"
-    And my tax total should be "$22.00"
+    @ui
+    Scenario: Paying taxes while ordering as an EU individual
+        Given I added product "PHP T-Shirt" to the cart
+        And I am at the checkout addressing step
+        And I specify the email as "german-individual@email.com"
+        And I specify a valid german individual billing address
+        And I complete the addressing step
+        And I proceed with "Free" shipping method and "Offline" payment
+        Then I should be on the checkout complete step
+        And my order total should be "$122.00"
+        And my tax total should be "$22.00"
 
-  @ui
-  Scenario: Not paying taxes while ordering as an EU company
-    Given I added product "PHP T-Shirt" to the cart
-    And I am at the checkout addressing step
-    And I specify the email as "german-company@email.com"
-    And I specify a valid german company billing address
-    And I complete the addressing step
-    And I proceed with "Free" shipping method and "Offline" payment
-    Then I should be on the checkout complete step
-    And my order total should be "$100.00"
-    And my tax total should be "$0.00"
+    @ui
+    Scenario: Not paying taxes while ordering as an EU company
+        Given I added product "PHP T-Shirt" to the cart
+        And I am at the checkout addressing step
+        And I specify the email as "german-company@email.com"
+        And I specify a valid german company billing address
+        And I complete the addressing step
+        And I proceed with "Free" shipping method and "Offline" payment
+        Then I should be on the checkout complete step
+        And my order total should be "$100.00"
+        And my tax total should be "$0.00"
 
-  @ui
-  Scenario: Not paying taxes while ordering as an extra EU individual
-    Given I added product "PHP T-Shirt" to the cart
-    And I am at the checkout addressing step
-    And I specify the email as "usa-individual@email.com"
-    And I specify a valid US individual billing address
-    And I complete the addressing step
-    And I proceed with "Free" shipping method and "Offline" payment
-    Then I should be on the checkout complete step
-    And my order total should be "$100.00"
-    And my tax total should be "$0.00"
+    @ui
+    Scenario: Not paying taxes while ordering as an extra EU individual
+        Given I added product "PHP T-Shirt" to the cart
+        And I am at the checkout addressing step
+        And I specify the email as "usa-individual@email.com"
+        And I specify a valid US individual billing address
+        And I complete the addressing step
+        And I proceed with "Free" shipping method and "Offline" payment
+        Then I should be on the checkout complete step
+        And my order total should be "$100.00"
+        And my tax total should be "$0.00"
 
-  @ui
-  Scenario: Not paying taxes while ordering as an extra EU company
-    Given I added product "PHP T-Shirt" to the cart
-    And I am at the checkout addressing step
-    And I specify the email as "usa-company@email.com"
-    And I specify a valid US company billing address
-    And I complete the addressing step
-    And I proceed with "Free" shipping method and "Offline" payment
-    Then I should be on the checkout complete step
-    And my order total should be "$100.00"
-    And my tax total should be "$0.00"
+    @ui
+    Scenario: Not paying taxes while ordering as an extra EU company
+        Given I added product "PHP T-Shirt" to the cart
+        And I am at the checkout addressing step
+        And I specify the email as "usa-company@email.com"
+        And I specify a valid US company billing address
+        And I complete the addressing step
+        And I proceed with "Free" shipping method and "Offline" payment
+        Then I should be on the checkout complete step
+        And my order total should be "$100.00"
+        And my tax total should be "$0.00"
diff --git a/src/Taxation/ItalianTaxCalculationStrategy.php b/src/Taxation/ItalianTaxCalculationStrategy.php
@@ -14,23 +14,20 @@
 
 final class ItalianTaxCalculationStrategy implements TaxCalculationStrategyInterface
 {
-    private string $type;
-
-    /** @var OrderTaxesApplicatorInterface[] */
-    private array $applicators;
-
-    private string $euTaxZoneCode;
+    /** @var iterable<OrderTaxesApplicatorInterface> */
+    private iterable $applicators;
 
     /**
-     * @param OrderTaxesApplicatorInterface[] $applicators
+     * @param iterable<OrderTaxesApplicatorInterface>|iterable $applicators
      */
-    public function __construct(string $type, array $applicators, string $euTaxZoneCode)
-    {
-        $this->assertApplicatorsHaveCorrectType($applicators);
+    public function __construct(
+        private string $type,
+        iterable $applicators,
+        private string $euTaxZoneCode,
+    ) {
+        Assert::allIsInstanceOf($applicators, OrderTaxesApplicatorInterface::class);
 
-        $this->type = $type;
         $this->applicators = $applicators;
-        $this->euTaxZoneCode = $euTaxZoneCode;
     }
 
     #[\Override]
@@ -62,15 +59,6 @@ public function supports(OrderInterface $order, ZoneInterface $zone): bool
         return $channel->getTaxCalculationStrategy() === $this->type;
     }
 
-    private function assertApplicatorsHaveCorrectType(array $applicators): void
-    {
-        Assert::allIsInstanceOf(
-            $applicators,
-            OrderTaxesApplicatorInterface::class,
-            'Order taxes applicator should have type "%2$s". Got: %s',
-        );
-    }
-
     private function shouldSkipTaxesApplication(OrderInterface $order, ZoneInterface $zone): bool
     {
         if ($this->euTaxZoneCode === '') {
diff --git a/src/Validator/Constraints/EuropeanVatNumberValidator.php b/src/Validator/Constraints/EuropeanVatNumberValidator.php
@@ -16,6 +16,9 @@
  */
 final class EuropeanVatNumberValidator extends ConstraintValidator
 {
+    /**
+     * @psalm-suppress PossiblyUnusedMethod
+     */
     public function __construct(
         private readonly Vies $viesApi,
         private readonly LoggerInterface $logger,
diff --git a/tests/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php b/tests/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php
@@ -11,6 +11,7 @@
 use Sylius\Behat\Service\SharedStorageInterface;
 use Sylius\Component\Core\Model\AddressInterface;
 use Tests\Webgriffe\SyliusItalianInvoiceableOrderPlugin\Behat\Page\Shop\Checkout\AddressPageInterface;
+use Tests\Webgriffe\SyliusItalianInvoiceableOrderPlugin\Behat\Service\InMemoryEuropeanVatNumberValidator;
 use Webgriffe\SyliusItalianInvoiceableOrderPlugin\Model\ItalianInvoiceableAddressInterface;
 use Webmozart\Assert\Assert;
 
@@ -249,6 +250,7 @@ public function iShouldBeNotifiedThatTheBillingCompanyNameIsRequired(): void
      */
     public function iSpecifyAnInvalidVatNumberForAGermanCompany(): void
     {
+        InMemoryEuropeanVatNumberValidator::$isValid = false;
         $this->addressPage->specifyBillingVatNumber('DE123456789');
     }
 
@@ -257,6 +259,7 @@ public function iSpecifyAnInvalidVatNumberForAGermanCompany(): void
      */
     public function iSpecifyAValidBillingVatNumberForAGermanCompany(): void
     {
+        InMemoryEuropeanVatNumberValidator::$isValid = true;
         // This is the real german company Hetzner (https://www.hetzner.com/) VAT number
         $this->addressPage->specifyBillingVatNumber('DE812871812');
     }
diff --git a/tests/Behat/Resources/services.xml b/tests/Behat/Resources/services.xml
@@ -68,5 +68,9 @@
             <argument type="service" id="sylius.factory.zone" />
             <argument>%locale%</argument>
         </service>
+
+        <service id="webgriffe_sylius_italian_invoiceable_order.validator.european_vat_number" class="Tests\Webgriffe\SyliusItalianInvoiceableOrderPlugin\Behat\Service\InMemoryEuropeanVatNumberValidator">
+            <tag name="validator.constraint_validator" alias="webgriffe_sylius_italian_invoiceable_order.european_vat_number_validator"/>
+        </service>
     </services>
 </container>
diff --git a/tests/Behat/Service/InMemoryEuropeanVatNumberValidator.php b/tests/Behat/Service/InMemoryEuropeanVatNumberValidator.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Webgriffe\SyliusItalianInvoiceableOrderPlugin\Behat\Service;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Webgriffe\SyliusItalianInvoiceableOrderPlugin\Validator\Constraints\EuropeanVatNumber;
+
+final class InMemoryEuropeanVatNumberValidator extends ConstraintValidator
+{
+    public static bool $isValid = true;
+
+    #[\Override]
+    public function validate(mixed $value, Constraint $constraint): void
+    {
+        if (!is_string($value) || $value === '') {
+            return;
+        }
+
+        if (!$constraint instanceof EuropeanVatNumber) {
+            return;
+        }
+        if (self::$isValid) {
+            return;
+        }
+
+        $format = $constraint->getFormat();
+        $this->context->addViolation($constraint->message, ['%format%' => $format]);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -81,12 +81,6 @@`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`},`
`84`		`- "repositories": {`
`85`		`- "sandwich/vies-bundle": {`
`86`		`- "type": "git",`
`87`		`- "url": "https://github.com/mmenozzi/ViesBundle.git"`
`88`		`- }`
`89`		`- },`
`90`	`84`	`"autoload": {`
`91`	`85`	`"psr-4": {`
`92`	`86`	`"Webgriffe\\SyliusItalianInvoiceableOrderPlugin\\": "src/"`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`use Sylius\Behat\Service\SharedStorageInterface;`
`12`	`12`	`use Sylius\Component\Core\Model\AddressInterface;`
`13`	`13`	`use Tests\Webgriffe\SyliusItalianInvoiceableOrderPlugin\Behat\Page\Shop\Checkout\AddressPageInterface;`
	`14`	`+use Tests\Webgriffe\SyliusItalianInvoiceableOrderPlugin\Behat\Service\InMemoryEuropeanVatNumberValidator;`
`14`	`15`	`use Webgriffe\SyliusItalianInvoiceableOrderPlugin\Model\ItalianInvoiceableAddressInterface;`
`15`	`16`	`use Webmozart\Assert\Assert;`
`16`	`17`
`@@ -249,6 +250,7 @@ public function iShouldBeNotifiedThatTheBillingCompanyNameIsRequired(): void`
`249`	`250`	`*/`
`250`	`251`	`public function iSpecifyAnInvalidVatNumberForAGermanCompany(): void`
`251`	`252`	`{`
	`253`	`+ InMemoryEuropeanVatNumberValidator::$isValid = false;`
`252`	`254`	`$this->addressPage->specifyBillingVatNumber('DE123456789');`
`253`	`255`	`}`
`254`	`256`
`@@ -257,6 +259,7 @@ public function iSpecifyAnInvalidVatNumberForAGermanCompany(): void`
`257`	`259`	`*/`
`258`	`260`	`public function iSpecifyAValidBillingVatNumberForAGermanCompany(): void`
`259`	`261`	`{`
	`262`	`+ InMemoryEuropeanVatNumberValidator::$isValid = true;`
`260`	`263`	`// This is the real german company Hetzner (https://www.hetzner.com/) VAT number`
`261`	`264`	`$this->addressPage->specifyBillingVatNumber('DE812871812');`
`262`	`265`	`}`