PHP 8.4 support

composer.json

@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.5.0",
-        "commerceguys/addressing": "^1.0",
+        "commerceguys/addressing": "^1.0 || ^2.0",
         "commerceguys/zone": "^0.8",
         "doctrine/collections": "^1.0 || ^2.0"
     },

src/Model/TaxRate.php

@@ -76,7 +76,7 @@ public function getType()
     /**
      * {@inheritdoc}
      */
-    public function setType(TaxTypeEntityInterface $type = null)
+    public function setType(TaxTypeEntityInterface|null $type = null)
     {
         $this->type = $type;
 
@@ -166,7 +166,7 @@ public function hasAmounts()
     /**
      * {@inheritdoc}
      */
-    public function getAmount(\DateTime $date = null)
+    public function getAmount(\DateTime|null $date = null)
     {
         if (is_null($date)) {
             // Initialize DateTime to the current date.

src/Model/TaxRateAmount.php

@@ -55,7 +55,7 @@ public function getRate()
     /**
      * {@inheritdoc}
      */
-    public function setRate(TaxRateEntityInterface $rate = null)
+    public function setRate(TaxRateEntityInterface|null $rate = null)
     {
         $this->rate = $rate;
 

src/Model/TaxRateAmountEntityInterface.php

@@ -11,7 +11,7 @@ interface TaxRateAmountEntityInterface extends TaxRateAmountInterface
      *
      * @return self
      */
-    public function setRate(TaxRateEntityInterface $rate = null);
+    public function setRate(TaxRateEntityInterface|null $rate = null);
 
     /**
      * Sets the tax rate amount id.

src/Model/TaxRateEntityInterface.php

@@ -13,7 +13,7 @@ interface TaxRateEntityInterface extends TaxRateInterface
      *
      * @return self
      */
-    public function setType(TaxTypeEntityInterface $type = null);
+    public function setType(TaxTypeEntityInterface|null $type = null);
 
     /**
      * Sets the tax rate id.

src/Repository/TaxTypeRepository.php

@@ -48,7 +48,7 @@ class TaxTypeRepository implements TaxTypeRepositoryInterface
      * @param string $definitionPath The path to the tax type and zone
      *                               definitions. Defaults to 'resources/'.
      */
-    public function __construct($definitionPath = null, ZoneRepositoryInterface $zoneRepository = null)
+    public function __construct(string|null $definitionPath = null, ZoneRepositoryInterface|null $zoneRepository = null)
     {
         $definitionPath = $definitionPath ?: __DIR__ . '/../../resources/';
         $this->definitionPath = $definitionPath . 'tax_type/';

src/Resolver/Context.php

@@ -58,7 +58,7 @@ class Context
      * @param array             $storeRegistrations
      * @param \DateTime         $date
      */
-    public function __construct(AddressInterface $customerAddress, AddressInterface $storeAddress, $customerTaxNumber = '', array $storeRegistrations = [], \DateTime $date = null)
+    public function __construct(AddressInterface $customerAddress, AddressInterface $storeAddress, $customerTaxNumber = '', array $storeRegistrations = [], \DateTime|null $date = null)
     {
         $this->customerAddress = $customerAddress;
         $this->storeAddress = $storeAddress;

tests/Resolver/TaxRate/DefaultTaxRateResolverTest.php

@@ -3,13 +3,16 @@
 namespace CommerceGuys\Tax\Tests\Resolver;
 
 use CommerceGuys\Tax\Resolver\TaxRate\DefaultTaxRateResolver;
+use CommerceGuys\Tax\Resolver\TaxRate\TaxRateResolverInterface;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Tax\Resolver\TaxRate\DefaultTaxRateResolver
  */
 class DefaultTaxRateResolverTest extends TestCase
 {
+
+    protected TaxRateResolverInterface $resolver;
     /**
      * {@inheritdoc}
      */

tests/Resolver/TaxType/EuTaxTypeResolverTest.php

@@ -287,7 +287,7 @@ public function dataProvider()
      *
      * @return \CommerceGuys\Tax\Resolver\Context
      */
-    protected function getContext($customerAddress, $storeAddress, $customerTaxNumber = '', $storeRegistrations = [], $date = null)
+    protected function getContext($customerAddress, $storeAddress, $customerTaxNumber = '', $storeRegistrations = [], \DateTime|null $date = null)
     {
         $context = $this
             ->getMockBuilder('CommerceGuys\Tax\Resolver\Context')