ConfigurableModel::hasConfiguration() returns false on empty arrays

vanilophp · Jul 24, 2024 · 4ddbfd8 · 4ddbfd8
1 parent 714ff66
commit 4ddbfd8
Show file tree

Hide file tree

Showing 19 changed files with 82 additions and 11 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,20 @@
 
 ## 4.x Series
 
+## Unreleased
+##### 2024-XX-YY
+
+- Changed the `ConfigurableModel::hasConfiguration()` trait to return false on empty arrays as well
+  (until now, only `null` was considered as no config). It affects the following models:
+    - `Carrier`
+    - `CartItem`
+    - `Channel`
+    - `OrderItem`
+    - `PaymentMethod`
+    - `Shipment`
+    - `ShippingMethod`
+    - `TaxRate`
+
 ## 4.1.0
 ##### 2024-07-11
 

diff --git a/src/Cart/Changelog.md b/src/Cart/Changelog.md
@@ -2,6 +2,11 @@
 
 ## 4.x Series
 
+## Unreleased
+##### 2024-XX-YY
+
+- Changed `CartItem::hasConfiguration()` to return false on empty arrays as well
+
 ## 4.1.0
 ##### 2024-07-11
 

diff --git a/src/Cart/composer.json b/src/Cart/composer.json
@@ -22,7 +22,7 @@
         "konekt/enum": "^4.2",
         "laravel/framework": "^10.43|^11.0",
         "vanilo/contracts": "^4.0",
-        "vanilo/support": "^4.0"
+        "vanilo/support": "^4.2"
     },
     "require-dev": {
         "ext-sqlite3": "*",

diff --git a/src/Channel/Changelog.md b/src/Channel/Changelog.md
@@ -2,6 +2,11 @@
 
 ## 4.x Series
 
+## Unreleased
+##### 2024-XX-YY
+
+- Changed `Channel::hasConfiguration()` to return false on empty arrays as well
+
 ## 4.1.0
 ##### 2024-07-11
 

diff --git a/src/Channel/composer.json b/src/Channel/composer.json
@@ -21,7 +21,7 @@
         "konekt/concord": "^1.13",
         "cviebrock/eloquent-sluggable": "^10.0|^11.0",
         "laravel/framework": "^10.43|^11.0",
-        "vanilo/support": "^4.0"
+        "vanilo/support": "^4.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",

diff --git a/src/Checkout/composer.json b/src/Checkout/composer.json
@@ -21,7 +21,7 @@
         "konekt/concord": "^1.13",
         "konekt/enum": "^4.2",
         "laravel/framework": "^10.43|^11.0",
-        "vanilo/support": "^4.0",
+        "vanilo/support": "^4.2",
         "vanilo/contracts": "^4.0"
     },
     "require-dev": {

diff --git a/src/MasterProduct/composer.json b/src/MasterProduct/composer.json
@@ -25,7 +25,7 @@
         "laravel/framework": "^10.43|^11.0",
         "vanilo/contracts": "^4.0",
         "vanilo/product": "^4.0",
-        "vanilo/support": "^4.0"
+        "vanilo/support": "^4.2"
     },
     "suggest": {
         "vanilo/properties": "Allows establishing variants based on properties like color, size, etc"

diff --git a/src/Order/Changelog.md b/src/Order/Changelog.md
@@ -2,6 +2,11 @@
 
 ## 4.x Series
 
+## Unreleased
+##### 2024-XX-YY
+
+- Changed `OrderItem::hasConfiguration()` to return false on empty arrays as well
+
 ## 4.1.0
 ##### 2024-07-11
 

diff --git a/src/Order/Tests/OrderItemTest.php b/src/Order/Tests/OrderItemTest.php
@@ -71,7 +71,7 @@ public function product_can_be_added_to_order_item()
     }
 
     /** @test */
-    public function order_items_can_be_configured()
+    public function it_can_be_configured()
     {
         $order = Order::create([
             'number' => 'WYHP7'
@@ -91,6 +91,26 @@ public function order_items_can_be_configured()
         $this->assertEquals('dolly buster', $item->configuration['hello']);
     }
 
+    /** @test */
+    public function it_has_no_configuration_by_default()
+    {
+        $order = Order::create([
+            'number' => 'W0DRN'
+        ]);
+
+        $order->items()->create([
+            'product_type' => 'product',
+            'product_id' => $this->theMoonRing->getId(),
+            'quantity' => 1,
+            'name' => $this->theMoonRing->getName(),
+            'price' => $this->theMoonRing->getPrice()
+        ]);
+
+        $item = $order->items->first();
+
+        $this->assertFalse($item->hasConfiguration());
+    }
+
     /** @test */
     public function an_order_item_has_a_default_fullfillment_state()
     {

diff --git a/src/Order/composer.json b/src/Order/composer.json
@@ -25,7 +25,7 @@
         "konekt/user": "^3.0",
         "laravel/framework": "^10.43|^11.0",
         "vanilo/contracts": "^4.0",
-        "vanilo/support": "^4.0"
+        "vanilo/support": "^4.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",

diff --git a/src/Payment/Changelog.md b/src/Payment/Changelog.md
@@ -2,6 +2,11 @@
 
 ## 4.x Series
 
+## Unreleased
+##### 2024-XX-YY
+
+- Changed `PaymentMethod::hasConfiguration()` to return false on empty arrays as well
+
 ## 4.1.0
 ##### 2024-07-11
 

diff --git a/src/Payment/composer.json b/src/Payment/composer.json
@@ -22,7 +22,7 @@
         "konekt/enum": "^4.2",
         "laravel/framework": "^10.43|^11.0",
         "vanilo/contracts": "^4.0",
-        "vanilo/support": "^4.0"
+        "vanilo/support": "^4.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",

diff --git a/src/Product/composer.json b/src/Product/composer.json
@@ -23,7 +23,7 @@
         "konekt/enum-eloquent": "^1.9",
         "laravel/framework": "^10.43|^11.0",
         "vanilo/contracts": "^4.0",
-        "vanilo/support": "^4.0",
+        "vanilo/support": "^4.2",
         "cviebrock/eloquent-sluggable": "^10.0|^11.0"
     },
     "require-dev": {

diff --git a/src/Shipment/Changelog.md b/src/Shipment/Changelog.md
@@ -2,6 +2,13 @@
 
 ## 4.x Series
 
+## Unreleased
+##### 2024-XX-YY
+
+- Changed `ShippingMethod::hasConfiguration()` to return false on empty arrays as well
+- Changed `Shipment::hasConfiguration()` to return false on empty arrays as well
+- Changed `Carrier::hasConfiguration()` to return false on empty arrays as well
+
 ## 4.1.0
 ##### 2024-07-11
 

diff --git a/src/Shipment/composer.json b/src/Shipment/composer.json
@@ -24,7 +24,7 @@
         "konekt/laravel-migration-compatibility": "^1.6",
         "laravel/framework": "^10.43|^11.0",
         "vanilo/contracts": "^4.0",
-        "vanilo/support": "^4.0"
+        "vanilo/support": "^4.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",

diff --git a/src/Support/Changelog.md b/src/Support/Changelog.md
@@ -2,6 +2,11 @@
 
 ## 4.x Series
 
+## Unreleased
+##### 2024-XX-YY
+
+- Changed the `ConfigurableModel::hasConfiguration()` trait to return false on empty arrays as well (until now, only `null` was considered as no config)
+
 ## 4.1.0
 ##### 2024-07-11
 

diff --git a/src/Support/Traits/ConfigurableModel.php b/src/Support/Traits/ConfigurableModel.php
@@ -42,7 +42,7 @@ public function configuration(): ?array
 
     public function hasConfiguration(): bool
     {
-        return null !== $this->{static::$configurationFieldName};
+        return !empty($this->{static::$configurationFieldName});
     }
 
     public function doesntHaveConfiguration(): bool

diff --git a/src/Taxes/Changelog.md b/src/Taxes/Changelog.md
@@ -2,6 +2,11 @@
 
 ## 4.x Series
 
+## Unreleased
+##### 2024-XX-YY
+
+- Changed `TaxRate::hasConfiguration()` to return false on empty arrays as well
+
 ## 4.1.0
 ##### 2024-07-11
 

diff --git a/src/Taxes/composer.json b/src/Taxes/composer.json
@@ -25,7 +25,7 @@
         "laravel/framework": "^10.43|^11.0",
         "nette/schema": "^1.2.5",
         "vanilo/contracts": "^4.0",
-        "vanilo/support": "^4.0"
+        "vanilo/support": "^4.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",