Fix issue where exception was sometimes catched while it shouldnt

spatie · Jul 25, 2024 · 2b63d72 · 2b63d72
1 parent ec3351f
commit 2b63d72
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/DataPipes/CastPropertiesDataPipe.php b/src/DataPipes/CastPropertiesDataPipe.php
@@ -14,6 +14,7 @@
 use Spatie\LaravelData\Support\DataClass;
 use Spatie\LaravelData\Support\DataConfig;
 use Spatie\LaravelData\Support\DataProperty;
+use Spatie\LaravelData\Support\Types\CombinationType;
 
 class CastPropertiesDataPipe implements DataPipe
 {
@@ -97,8 +98,16 @@ protected function cast(
  $creationContext->previous();
 
  return $data;
- } catch (CannotCreateData) {
- return $value;
+ } catch (CannotCreateData $exception) {
+ $creationContext->previous();
+
+ if ($property->type->type instanceof CombinationType) {
+ // Try another type in the union (which will need to be a simple type like string, int)
+ // In the future we should deterministically choose the correct type to cast to
+ return $value;
+ }
+
+ throw $exception;
  }
  }
 
@@ -208,7 +217,7 @@ protected function findCastForIterableItems(
  }
  }
 
- if(in_array($property->type->iterableItemType, ['bool', 'int', 'float', 'array', 'string'])) {
+ if (in_array($property->type->iterableItemType, ['bool', 'int', 'float', 'array', 'string'])) {
  return new BuiltinTypeCast($property->type->iterableItemType);
  }
 

diff --git a/tests/CreationTest.php b/tests/CreationTest.php
@@ -17,9 +17,7 @@
 use Spatie\LaravelData\Attributes\DataCollectionOf;
 use Spatie\LaravelData\Attributes\Validation\Min;
 use Spatie\LaravelData\Attributes\WithCast;
-
 use Spatie\LaravelData\Attributes\WithCastable;
-
 use Spatie\LaravelData\Casts\DateTimeInterfaceCast;
 use Spatie\LaravelData\Casts\Uncastable;
 use Spatie\LaravelData\Concerns\WithDeprecatedCollectionMethod;
@@ -51,6 +49,7 @@
 use Spatie\LaravelData\Tests\Fakes\ModelData;
 use Spatie\LaravelData\Tests\Fakes\Models\DummyModel;
 use Spatie\LaravelData\Tests\Fakes\MultiData;
+use Spatie\LaravelData\Tests\Fakes\NestedData;
 use Spatie\LaravelData\Tests\Fakes\NestedLazyData;
 use Spatie\LaravelData\Tests\Fakes\NestedModelCollectionData;
 use Spatie\LaravelData\Tests\Fakes\NestedModelData;
@@ -264,7 +263,6 @@
 });
 
 
-
 it('can create a data object from a stdClass object', function () {
  $object = (object) [
  'string' => 'test',
@@ -753,6 +751,12 @@ public function __construct(
  yield 'one param' => [['first' => 'First'], 'Could not create `Spatie\LaravelData\Tests\Fakes\MultiData`: the constructor requires 2 parameters, 1 given. Parameters given: first. Parameters missing: second.'],
 ]);
 
+it('throws a readable exception message when the constructor of a nested data object fails', function () {
+ expect(fn () => NestedData::from([
+ 'simple' => [],
+ ]))->toThrow(CannotCreateData::class, 'Could not create `Spatie\LaravelData\Tests\Fakes\SimpleData`: the constructor requires 1 parameters, 0 given. Parameters missing: string.');
+});
+
 it('a can create a collection of data objects', function () {
  $collectionA = new DataCollection(SimpleData::class, [
  SimpleData::from('A'),
@@ -1058,6 +1062,7 @@ public function __invoke(SimpleData $data)
 it('will cast iterables into the correct type', function () {
  $dataClass = new class () extends Data {
  public EloquentCollection $collection;
+
  public CustomCollection $customCollection;
 
  public array $array;