Skip to content

Commit d959635

Browse files
committed
improve resource collection discovery
1 parent babdca1 commit d959635

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

src/Illuminate/Collections/Traits/TransformsToResourceCollection.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,17 @@ protected function guessResourceCollection(): ResourceCollection
4747

4848
throw_unless(method_exists($className, 'guessResourceName'), LogicException::class, sprintf('Expected class %s to implement guessResourceName method. Make sure the model uses the TransformsToResource trait.', $className));
4949

50-
foreach ($className::guessResourceName() as $resourceClass) {
50+
$resourceClasses = $className::guessResourceName();
51+
52+
foreach ($resourceClasses as $resourceClass) {
53+
$resourceCollection = $resourceClass.'Collection';
54+
55+
if (is_string($resourceCollection) && class_exists($resourceCollection)) {
56+
return new $resourceCollection($this);
57+
}
58+
}
59+
60+
foreach ($resourceClasses as $resourceClass) {
5161
if (is_string($resourceClass) && class_exists($resourceClass)) {
5262
return $resourceClass::collection($this);
5363
}

0 commit comments

Comments
 (0)