Added fix for bug with class generics

Author: nizacegodk

src/TypeSystem/Type.php

@@ -3,16 +3,24 @@
 namespace Cego\phpstan\TypeSystem;
 
 use Stringable;
+use Illuminate\Support\Str;
 
 class Type implements Stringable
 {
+    public readonly string $type;
+
     /**
      * Constructor
      *
      * @param string $type
      */
-    public function __construct(public readonly string $type)
+    public function __construct(string $type)
     {
+        if (empty($type)) {
+            $this->type = 'mixed';
+        } else {
+            $this->type = Str::of($type)->replaceMatches('/<[^<>]*>/', '')->toString();
+        }
     }
 
     /**
@@ -32,8 +40,7 @@ public function isNotReal(): bool
      */
     public function isMixed(): bool
     {
-        return empty($this->type)
-        || strtolower($this->type) === 'mixed';
+        return strtolower($this->type) === 'mixed';
     }
 
     /**

test/Samples/EmptySpatieLaravelData.php

@@ -4,6 +4,9 @@
 
 use Spatie\LaravelData\Data;
 
+/**
+ * @template key
+ */
 class EmptySpatieLaravelData extends Data
 {
 }

test/Samples/GenericsSpatieLaravelData.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Test\Samples;
+
+use Spatie\LaravelData\Data;
+
+class GenericsSpatieLaravelData extends Data
+{
+    public function __construct(
+        public readonly EmptySpatieLaravelData $genericProperty,
+    ) {
+    }
+
+    public function initDefault(): self
+    {
+        /** @var EmptySpatieLaravelData<string> $var */
+        $var = '';
+
+        return self::from([
+            'genericProperty' => $var,
+        ]);
+    }
+}

test/SpatieLaravelData/ValidTypeRuleTest.php

@@ -78,6 +78,14 @@ public function it_ignores_potential_problems_for_objects_with_casts(): void
         ], []);
     }
 
+    /** @test */
+    public function it_does_not_care_about_generics(): void
+    {
+        $this->analyse([
+            __DIR__ . '/../Samples/GenericsSpatieLaravelData.php',
+        ], []);
+    }
+
     private function expectError(int $line, string $property, string $class, string $expectedType, string $actualType): array
     {
         return [