Merge branch 'release/3.1.0'

Skullbock · Skullbock · commit b26d20021c7c · 2023-02-20T16:13:34.000+01:00
diff --git a/composer.json b/composer.json
@@ -23,12 +23,12 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "cknow/laravel-money": "^6.2",
+        "cknow/laravel-money": "^6.2 || ^7.1",
         "commerceguys/addressing": "^1.0",
         "commerceguys/tax": "^0.8",
         "florianv/laravel-swap": "^2.3",
         "iben12/laravel-statable": "^1.4",
-        "illuminate/database": "^9.0",
+        "illuminate/database": "^9.0 || ^10.0",
         "mpociot/vat-calculator": "^3.0",
         "nyholm/psr7": "^1.3",
         "php-http/curl-client": "^2.1",
@@ -37,8 +37,8 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.7",
-        "orchestra/testbench": "^7.1",
-        "phpunit/phpunit": "^9.1"
+        "orchestra/testbench": "^7.1 || ^8.0",
+        "phpunit/phpunit": "^9.1 || ^10.0"
     },
     "autoload": {
         "files": [
@@ -59,7 +59,10 @@
         "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     },
     "extra": {
         "laravel": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false"
-         backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false"
-         stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-        <report>
-            <clover outputFile="build/logs/clover.xml"/>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-        </report>
-    </coverage>
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
 </phpunit>
diff --git a/src/Discount/Discount.php b/src/Discount/Discount.php
@@ -20,8 +20,8 @@ class Discount extends DataTransferObject implements Arrayable, Jsonable
 
     public function __construct(array $parameters = [])
     {
-        $this->attributes = collect([]);
         $parameters['id'] ??= sha1((string)Str::orderedUuid());
+        $parameters['attributes'] ??= Collection::make([]);
 
         parent::__construct($parameters);
     }
diff --git a/tests/Tax/TaxTest.php b/tests/Tax/TaxTest.php
@@ -47,8 +47,8 @@ public function can_calculate_tax_for_physical_product()
         $amounts = app()->make(TaxResolver::class)->resolveAmounts($product, $context);
         $tax     = $amounts[0]->getAmount();
 
-        $tax = money($tax * 100);
-        $this->assertTrue(money(22)->equals($tax));
+        $tax = money((string) $tax);
+        $this->assertTrue(money(22, $tax->getCurrency())->equals($tax),);
     }
 
     /** @test */

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ class Discount extends DataTransferObject implements Arrayable, Jsonable`
`20`	`20`
`21`	`21`	`public function __construct(array $parameters = [])`
`22`	`22`	`{`
`23`		`- $this->attributes = collect([]);`
`24`	`23`	`$parameters['id'] ??= sha1((string)Str::orderedUuid());`
	`24`	`+ $parameters['attributes'] ??= Collection::make([]);`
`25`	`25`
`26`	`26`	`parent::__construct($parameters);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ public function can_calculate_tax_for_physical_product()`
`47`	`47`	`$amounts = app()->make(TaxResolver::class)->resolveAmounts($product, $context);`
`48`	`48`	`$tax = $amounts[0]->getAmount();`
`49`	`49`
`50`		`- $tax = money($tax * 100);`
`51`		`- $this->assertTrue(money(22)->equals($tax));`
	`50`	`+ $tax = money((string) $tax);`
	`51`	`+ $this->assertTrue(money(22, $tax->getCurrency())->equals($tax),);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/** @test */`