Update ensure() collection method to correctly work with Interfaces a…

…nd object inheritance (#296) Co-authored-by: Deeka Wong <[email protected]>
friendsofhyperf · Aug 2, 2023 · 90cf69a · 90cf69a
1 parent 2ce8c5a
commit 90cf69a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/output/Hyperf/Collection/Collection.php b/output/Hyperf/Collection/Collection.php
@@ -31,10 +31,10 @@ public function doesntContain($key, $operator = null, $value = null)
     /**
      * Ensure that every item in the collection is of the expected type.
      *
-     * @template TEnforceIntoValue
+     * @template TEnsureOfType
      *
-     * @param class-string<TEnforceIntoValue> $type
-     * @return static<mixed, TEnforceIntoValue>
+     * @param class-string<TEnsureOfType> $type
+     * @return static<mixed, TEnsureOfType>
      *
      * @throws UnexpectedValueException
      */

diff --git a/src/CollectionMixin.php b/src/CollectionMixin.php
@@ -36,8 +36,10 @@ public function ensure()
         return fn ($type) => $this->each(function ($item) use ($type) {
             $itemType = get_debug_type($item);
 
-            if ($itemType !== $type) {
-                throw new UnexpectedValueException("Collection should only include '{$type}' items, but '{$itemType}' found.");
+            if ($itemType !== $type && ! $item instanceof $type) {
+                throw new UnexpectedValueException(
+                    sprintf("Collection should only include '%s' items, but '%s' found.", $type, $itemType)
+                );
             }
         });
     }