From 959a6cae988fdfa91f41d937c19ed78be305c71e Mon Sep 17 00:00:00 2001
From: Alex Rififi <s@lifestar.ru>
Date: Sun, 11 Feb 2024 22:26:40 +0500
Subject: [PATCH] Fix CastPropertiesDataPipe logic

---
 src/DataPipes/CastPropertiesDataPipe.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/DataPipes/CastPropertiesDataPipe.php b/src/DataPipes/CastPropertiesDataPipe.php
index e3477e385..64b965012 100644
--- a/src/DataPipes/CastPropertiesDataPipe.php
+++ b/src/DataPipes/CastPropertiesDataPipe.php
@@ -53,15 +53,18 @@ protected function cast(
             return $value;
         }
 
-        if ($casted = $this->tryCast($property->cast, $property, $value, $properties, $creationContext)) {
+        $casted = $this->tryCast($property->cast, $property, $value, $properties, $creationContext);
+        if ($casted !== null) {
             return $casted;
         }
 
-        if ($casted = $this->tryCast($creationContext->casts?->findCastForValue($property), $property, $value, $properties, $creationContext)) {
+        $casted = $this->tryCast($creationContext->casts?->findCastForValue($property), $property, $value, $properties, $creationContext);
+        if ($casted !== null) {
             return $casted;
         }
 
-        if ($casted = $this->tryCast($this->dataConfig->casts->findCastForValue($property), $property, $value, $properties, $creationContext)) {
+        $casted = $this->tryCast($this->dataConfig->casts->findCastForValue($property), $property, $value, $properties, $creationContext);
+        if ($casted !== null) {
             return $casted;
         }