adjust tests and logic

laravel · taylorotwell · Apr 2, 2025 · Mar 20, 2025 · Mar 20, 2025 · Mar 20, 2025
commit 9e9f8a64fbb76f56fbeab7cfaa7b68ff7a389a76
diff --git a/src/Illuminate/Http/Resources/TransformsToResource.php b/src/Illuminate/Http/Resources/TransformsToResource.php
@@ -34,45 +34,42 @@ public function toResource(?string $resourceClass = null): JsonResource
      */
     protected function guessResource(): JsonResource
     {
-        $resourceClass = static::guessResourceName();
-
-        throw_unless(
-            is_string($resourceClass) && class_exists($resourceClass),
-            LogicException::class, sprintf('Failed to find resource class for model [%s].', get_class($this))
-        );
+        foreach (static::guessResourceName() as $resourceClass) {
+            if (is_string($resourceClass) && class_exists($resourceClass)) {
+                return $resourceClass::make($this);
+            }
+        }
 
-        return $resourceClass::make($this);
+        throw new LogicException(sprintf('Failed to find resource class for model [%s].', get_class($this)));
     }
 
     /**
      * Guess the resource class name for the model.
      *
-     * @return class-string<JsonResource>
+     * @return array<class-string<JsonResource>>
      */
-    public static function guessResourceName(): string
+    public static function guessResourceName(): array
     {
         $modelClass = static::class;
 
         if (! Str::contains($modelClass, '\\Models\\')) {
-            return false;
+            return [];
         }
 
         // Get everything after the "Models" namespace...
         $relativeNamespace = Str::after($modelClass, '\\Models\\');
-        $relativeNamespace = str_replace('\\'.class_basename($modelClass), '', $relativeNamespace);
 
-        if ($relativeNamespace === class_basename($modelClass)) {
-            $relativeNamespace = '';
-        }
-
-        // Get the root namespace (everything before "Models")...
-        $rootNamespace = Str::before($modelClass, '\\Models');
+        $relativeNamespace = Str::contains($relativeNamespace, '\\')
+            ? Str::before($relativeNamespace, '\\'.class_basename($modelClass))
+            : '';
 
-        return sprintf(
            '%s\\Http\\Resources\\%s%sResource',
-            $rootNamespace,
-            $relativeNamespace ? $relativeNamespace.'\\' : '',
+        $potentialResource = sprintf(
+            '%s\\Http\\Resources\\%s%s',
+            Str::before($modelClass, '\\Models'),
+            strlen($relativeNamespace) > 0 ? $relativeNamespace.'\\' : '',
             class_basename($modelClass)
         );
+
+        return [$potentialResource.'Resource', $potentialResource];
     }
 }
diff --git a/src/Illuminate/Http/Resources/TransformsToResourceCollection.php b/src/Illuminate/Http/Resources/TransformsToResourceCollection.php
@@ -48,10 +48,12 @@ protected function guessResourceCollection(): ResourceCollection
 
         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));
 
-        $resourceClass = $className::guessResourceName();
-
-        throw_unless(class_exists($resourceClass), LogicException::class, sprintf('Failed to find resource class for model [%s].', $className));
+        foreach ($className::guessResourceName() as $resourceClass) {
+            if (is_string($resourceClass) && class_exists($resourceClass)) {
+                return $resourceClass::collection($this);
+            }
+        }
 
-        return $resourceClass::collection($this);
+        throw new LogicException(sprintf('Failed to find resource class for model [%s].', $className));
     }
 }
diff --git a/tests/Database/DatabaseEloquentResourceModelTest.php b/tests/Database/DatabaseEloquentResourceModelTest.php
@@ -43,7 +43,10 @@ class_alias(EloquentResourceTestJsonResource::class, 'Illuminate\Tests\Database\
     public function testItCanGuessResourceName()
     {
         $model = new EloquentResourceTestResourceModel();
-        $this->assertEquals('Illuminate\Tests\Database\Fixtures\Http\Resources\EloquentResourceTestResourceModelResource', $model::guessResourceName());
+        $this->assertEquals([
+            'Illuminate\Tests\Database\Fixtures\Http\Resources\EloquentResourceTestResourceModelResource',
+            'Illuminate\Tests\Database\Fixtures\Http\Resources\EloquentResourceTestResourceModel'
+        ], $model::guessResourceName());
     }
 }