Optimized LongCast and DoubleCast (#648)

* Optimized LongCast and DoubleCast * feat: Optimize LongCast and DoubleCast --------- Co-authored-by: Deeka Wong <[email protected]>
friendsofhyperf · May 28, 2024 · 401f73b · 401f73b
1 parent 6ea1c69
commit 401f73b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/src/validated-dto/src/Casting/DoubleCast.php b/src/validated-dto/src/Casting/DoubleCast.php
@@ -12,6 +12,7 @@
 namespace FriendsOfHyperf\ValidatedDTO\Casting;
 
 use FriendsOfHyperf\ValidatedDTO\Exception\CastException;
+use Throwable;
 
 class DoubleCast implements Castable
 {
@@ -20,6 +21,10 @@ class DoubleCast implements Castable
      */
     public function cast(string $property, mixed $value): float
     {
-        return (float) $value;
+        try {
+            return (float) $value;
+        } catch (Throwable $e) { // @phpstan-ignore-line
+            throw new CastException($property);
+        }
     }
 }
diff --git a/src/validated-dto/src/Casting/LongCast.php b/src/validated-dto/src/Casting/LongCast.php
@@ -12,6 +12,7 @@
 namespace FriendsOfHyperf\ValidatedDTO\Casting;
 
 use FriendsOfHyperf\ValidatedDTO\Exception\CastException;
+use Throwable;
 
 class LongCast implements Castable
 {
@@ -20,6 +21,10 @@ class LongCast implements Castable
      */
     public function cast(string $property, mixed $value): int
     {
-        return (int) $value;
+        try {
+            return (int) $value;
+        } catch (Throwable $e) { // @phpstan-ignore-line
+            throw new CastException($property);
+        }
     }
 }
diff --git a/tests/ValidatedDTO/Unit/DoubleCastTest.php b/tests/ValidatedDTO/Unit/DoubleCastTest.php
@@ -16,7 +16,17 @@
     ->cast(test_property(), '10.5')
     ->toBe(10.5);
 
-it('throws exception when it is unable to cast property')
+it('throws exception when it is string')
     ->expect(fn () => new DoubleCast())
     ->cast(test_property(), 'TEST')
+    ->toBe(0.0);
+
+it('throws exception when it is empty string')
+    ->expect(fn () => new DoubleCast())
+    ->cast(test_property(), '')
+    ->toBe(0.0);
+
+it('throws exception when it is unable to cast property')
+    ->expect(fn () => new DoubleCast())
+    ->cast(test_property(), new stdClass())
     ->throws(CastException::class, 'Unable to cast property: test_property - invalid value');
diff --git a/tests/ValidatedDTO/Unit/LongCastTest.php b/tests/ValidatedDTO/Unit/LongCastTest.php
@@ -16,7 +16,17 @@
     ->cast(test_property(), '5')
     ->toBe(5);
 
-it('throws exception when it is unable to cast property')
+it('throws exception when it is string')
     ->expect(fn () => new LongCast())
     ->cast(test_property(), 'TEST')
+    ->toBe(0);
+
+it('throws exception when it is empty string')
+    ->expect(fn () => new LongCast())
+    ->cast(test_property(), '')
+    ->toBe(0);
+
+it('throws exception when it is unable to cast property')
+    ->expect(fn () => new LongCast())
+    ->cast(test_property(), new stdClass())
     ->throws(CastException::class, 'Unable to cast property: test_property - invalid value');