[10.x] Add the ability to extend the generic types for DatabaseNotifi…

…cationCollection (laravel#47048) * Add the ability to extend the generic types * Update DatabaseNotificationCollection.php * Remove unused * Add tests * Fix style * rm lb * Updates localtion of type tests --------- Co-authored-by: Nuno Maduro <[email protected]>
milwad-dev · May 12, 2023 · 56c9c7d · 56c9c7d
1 parent 3ba111e
commit 56c9c7d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/src/Illuminate/Notifications/DatabaseNotificationCollection.php b/src/Illuminate/Notifications/DatabaseNotificationCollection.php
@@ -4,6 +4,12 @@
 
 use Illuminate\Database\Eloquent\Collection;
 
+/**
+ * @template TKey of array-key
+ * @template TModel of DatabaseNotification
+ *
+ * @extends \Illuminate\Database\Eloquent\Collection<TKey, TModel>
+ */
 class DatabaseNotificationCollection extends Collection
 {
     /**

diff --git a/types/Notifications/DatabaseNotificationCollection.php b/types/Notifications/DatabaseNotificationCollection.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Notifications\DatabaseNotification;
+use Illuminate\Notifications\DatabaseNotificationCollection;
+
+use function PHPStan\Testing\assertType;
+
+class CustomNotification extends DatabaseNotification
+{
+    //
+}
+
+/**
+ * @extends DatabaseNotificationCollection<int, CustomNotification>
+ */
+class CustomNotificationCollection extends DatabaseNotificationCollection
+{
+    //
+}
+
+$databaseNotificationsCollection = DatabaseNotification::all();
+assertType('Illuminate\Database\Eloquent\Collection<int, Illuminate\Notifications\DatabaseNotification>', $databaseNotificationsCollection);
+
+$customNotificationsCollection = CustomNotification::all();
+assertType('Illuminate\Database\Eloquent\Collection<int, CustomNotification>', $customNotificationsCollection);