Add adjustments

spatie · Oct 12, 2023 · e27501c · e27501c
1 parent dd921c0
commit e27501c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/Support/DataClass.php b/src/Support/DataClass.php
@@ -15,7 +15,6 @@
 use Spatie\LaravelData\Contracts\TransformableData;
 use Spatie\LaravelData\Contracts\ValidateableData;
 use Spatie\LaravelData\Contracts\WrappableData;
-use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Mappers\ProvidedNameMapper;
 use Spatie\LaravelData\Resolvers\NameMappersResolver;
 use Spatie\LaravelData\Support\Lazy\CachedLazy;
@@ -88,7 +87,8 @@ protected static function resolveAttributes(
             ->map(fn (ReflectionAttribute $reflectionAttribute) => $reflectionAttribute->newInstance());
 
         $parent = $class->getParentClass();
-        if ($parent !== false && $class->getName() !== Data::class) {
+
+        if ($parent !== false) {
             $attributes = $attributes->merge(static::resolveAttributes($parent));
         }
 

diff --git a/tests/Support/DataClassTest.php b/tests/Support/DataClassTest.php
@@ -92,7 +92,22 @@ public function __construct(
 });
 
 it('resolves parent attributes', function () {
-    $dataClass = DataClass::create(new ReflectionClass(ChildData::class));
+    #[MapName(SnakeCaseMapper::class)]
+    #[WithTransformer(DateTimeInterfaceTransformer::class, 'd-m-Y')]
+    #[WithCast(DateTimeInterfaceCast::class, format: 'Y-m-d')]
+    class TestRecursiveAttributesParentData extends Data
+    {
+    }
+
+    class TestRecursiveAttributesChildData extends TestRecursiveAttributesParentData
+    {
+        public function __construct(
+            public DateTimeInterface $dateTime
+        ) {
+        }
+    }
+
+    $dataClass = DataClass::create(new ReflectionClass(TestRecursiveAttributesChildData::class));
 
     expect($dataClass->attributes)
         ->toHaveCount(3)
@@ -136,18 +151,3 @@ public static function fromDummyModel(DummyModel $model)
         return new self($model->id);
     }
 }
-
-#[MapName(SnakeCaseMapper::class)]
-#[WithTransformer(DateTimeInterfaceTransformer::class, 'd-m-Y')]
-#[WithCast(DateTimeInterfaceCast::class, format: 'Y-m-d')]
-class ParentData extends Data
-{
-}
-
-class ChildData extends ParentData
-{
-    public function __construct(
-        public DateTimeInterface $dateTime
-    ) {
-    }
-}