Set null as default value for ends_in and ends_on (#15)

sequra · Jul 9, 2024 · 31c175e · 31c175e
1 parent faa1148
commit 31c175e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ServiceItem.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ServiceItem.php
@@ -134,8 +134,8 @@ public static function fromArray(array $data): Item
         $quantity = self::getDataValue($data, 'quantity', 1);
         $downloadable = self::getDataValue($data, 'downloadable', false);
         $totalWithTax = self::getDataValue($data, 'total_with_tax', 0);
-        $endsOn = self::getDataValue($data, 'ends_on');
-        $endsIn = self::getDataValue($data, 'ends_in');
+        $endsOn = self::getDataValue($data, 'ends_on', null);
+        $endsIn = self::getDataValue($data, 'ends_in', null);
         $supplier = self::getDataValue($data, 'supplier');
         $rendered = self::getDataValue($data, 'rendered');
 

diff --git a/src/Infrastructure/Data/DataTransferObject.php b/src/Infrastructure/Data/DataTransferObject.php
@@ -73,11 +73,11 @@ abstract public function toArray();
      *
      * @param array $rawData Raw DTO data.
      * @param string $key Data key.
-     * @param string $default Default value.
+     * @param mixed $default Default value.
      *
      * @return mixed
      */
-    protected static function getDataValue(array $rawData, $key, $default = '')
+    protected static function getDataValue(array $rawData, string $key, mixed $default = '')
     {
         return isset($rawData[$key]) ? $rawData[$key] : $default;
     }