-
Notifications
You must be signed in to change notification settings - Fork 11.5k
[12.x] Add resource helper functions to Model/Collections #55107
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+361
−3
Merged
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
0909ce1
Add resource helper functions
TimKunze96 b7d0768
Fix doc-block style
TimKunze96 469709a
Remove empty line
TimKunze96 a4f0faf
Make resource param optional and guess resource name
TimKunze96 491522e
Use throw_unless instead of assert
TimKunze96 c060601
Extract name guessing function
TimKunze96 7ef6563
Add tests for resource helpers
TimKunze96 ada10bd
Fix formatting
TimKunze96 48c0865
Fix namespace conflicts and add current page
TimKunze96 93f3df6
Use more descriptive LogicException instead of Exception
TimKunze96 5f7092d
Refactor to use traits and extend base collection instead of eloquent…
TimKunze96 fbf4f78
Ensure trait method exists
TimKunze96 6e878f4
formatting
taylorotwell 28c1d3f
formatting
taylorotwell c738f7f
formatting
taylorotwell 9e9f8a6
adjust tests and logic
taylorotwell bf7676b
add testS
taylorotwell bbe8ffb
remove comment
taylorotwell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
<?php | ||
|
||
namespace Illuminate\Http\Resources; | ||
|
||
use Illuminate\Http\Resources\Json\JsonResource; | ||
use Illuminate\Support\Str; | ||
use LogicException; | ||
|
||
trait TransformsToResource | ||
{ | ||
/** | ||
* Create a new resource object for the given resource. | ||
* | ||
* @param class-string<JsonResource>|null $resourceClass | ||
* @return JsonResource | ||
* | ||
* @throws \Throwable | ||
*/ | ||
public function toResource(?string $resourceClass = null): JsonResource | ||
{ | ||
if ($resourceClass === null) { | ||
return $this->guessResource(); | ||
} | ||
|
||
return $resourceClass::make($this); | ||
} | ||
|
||
/** | ||
* Guess the resource class for the model. | ||
* | ||
* @return JsonResource | ||
* | ||
* @throws \Throwable | ||
*/ | ||
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)) | ||
); | ||
|
||
return $resourceClass::make($this); | ||
} | ||
|
||
/** | ||
* Guess the resource class name for the model. | ||
* | ||
* @return class-string<JsonResource> | ||
*/ | ||
public static function guessResourceName(): string | ||
{ | ||
$modelClass = static::class; | ||
|
||
if (! Str::contains($modelClass, '\\Models\\')) { | ||
return false; | ||
} | ||
|
||
// 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'); | ||
|
||
return sprintf( | ||
'%s\\Http\\Resources\\%s%sResource', | ||
$rootNamespace, | ||
$relativeNamespace ? $relativeNamespace.'\\' : '', | ||
class_basename($modelClass) | ||
); | ||
} | ||
} |
57 changes: 57 additions & 0 deletions
57
src/Illuminate/Http/Resources/TransformsToResourceCollection.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
<?php | ||
|
||
namespace Illuminate\Http\Resources; | ||
|
||
use Illuminate\Database\Eloquent\Model; | ||
use Illuminate\Http\Resources\Json\JsonResource; | ||
use Illuminate\Http\Resources\Json\ResourceCollection; | ||
use LogicException; | ||
|
||
trait TransformsToResourceCollection | ||
{ | ||
/** | ||
* Create a new resource collection instance for the given resource. | ||
* | ||
* @param class-string<JsonResource>|null $resourceClass | ||
* @return ResourceCollection | ||
* | ||
* @throws \Throwable | ||
*/ | ||
public function toResourceCollection(?string $resourceClass = null): ResourceCollection | ||
{ | ||
if ($resourceClass === null) { | ||
return $this->guessResourceCollection(); | ||
} | ||
|
||
return $resourceClass::collection($this); | ||
} | ||
|
||
/** | ||
* Guess the resource collection for the items. | ||
* | ||
* @return ResourceCollection | ||
* | ||
* @throws \Throwable | ||
*/ | ||
protected function guessResourceCollection(): ResourceCollection | ||
{ | ||
if ($this->isEmpty()) { | ||
return new ResourceCollection($this); | ||
} | ||
|
||
$model = $this->items[0] ?? null; | ||
|
||
throw_unless(is_object($model), LogicException::class, 'Resource collection guesser expects the collection to contain objects.'); | ||
|
||
/** @var class-string<Model> $className */ | ||
$className = get_class($model); | ||
|
||
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)); | ||
|
||
return $resourceClass::collection($this); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
<?php | ||
|
||
namespace Illuminate\Tests\Database; | ||
|
||
use Illuminate\Database\Eloquent\Collection; | ||
use Illuminate\Database\Eloquent\Model; | ||
use Illuminate\Http\Res 10000 ources\Json\JsonResource; | ||
use Illuminate\Tests\Database\Fixtures\Models\EloquentResourceCollectionTestModel; | ||
use PHPUnit\Framework\TestCase; | ||
|
||
class DatabaseEloquentResourceCollectionTest extends TestCase | ||
{ | ||
public function testItCanTransformToExplicitResource() | ||
{ | ||
$collection = new Collection([ | ||
new EloquentResourceCollectionTestModel(), | ||
]); | ||
|
||
$resource = $collection->toResourceCollection(EloquentResourceCollectionTestResource::class); | ||
|
||
$this->assertInstanceOf(JsonResource::class, $resource); | ||
} | ||
|
||
public function testItThrowsExceptionWhenResourceCannotBeFound() | ||
{ | ||
$this->expectException(\LogicException::class); | ||
$this->expectExceptionMessage('Failed to find resource class for model [Illuminate\Tests\Database\Fixtures\Models\EloquentResourceCollectionTestModel].'); | ||
|
||
$collection = new Collection([ | ||
new EloquentResourceCollectionTestModel(), | ||
]); | ||
$collection->toResourceCollection(); | ||
} | ||
|
||
public function testItCanGuessResourceWhenNotProvided() | ||
{ | ||
$collection = new Collection([ | ||
new EloquentResourceCollectionTestModel(), | ||
]); | ||
|
||
class_alias(EloquentResourceCollectionTestResource::class, 'Illuminate\Tests\Database\Fixtures\Http\Resources\EloquentResourceCollectionTestModelResource'); | ||
|
||
$resource = $collection->toResourceCollection(); | ||
|
||
$this->assertInstanceOf(JsonResource::class, $resource); | ||
} | ||
} | ||
|
||
class EloquentResourceCollectionTestResource extends JsonResource | ||
{ | ||
// | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
<?php | ||
|
||
namespace Illuminate\Tests\Database; | ||
|
||
use Illuminate\Database\Eloquent\Model; | ||
use Illuminate\Http\Resources\Json\JsonResource; | ||
use Illuminate\Tests\Database\Fixtures\Models\EloquentResourceTestResourceModel; | ||
use Illuminate\Tests\Database\Fixtures\Models\EloquentResourceTestResourceModelWithGuessableResource; | ||
use PHPUnit\Framework\TestCase; | ||
|
||
class DatabaseEloquentResourceModelTest extends TestCase | ||
{ | ||
public function testItCanTransformToExplicitResource() | ||
{ | ||
$model = new EloquentResourceTestResourceModel(); | ||
$resource = $model->toResource(EloquentResourceTestJsonResource::class); | ||
|
||
$this->assertInstanceOf(EloquentResourceTestJsonResource::class, $resource); | ||
$this->assertSame($model, $resource->resource); | ||
} | ||
|
||
public function testItThrowsExceptionWhenResourceCannotBeFound() | ||
{ | ||
$this->expectException(\LogicException::class); | ||
$this->expectExceptionMessage('Failed to find resource class for model [Illuminate\Tests\Database\Fixtures\Models\EloquentResourceTestResourceModel].'); | ||
|
||
$model = new EloquentResourceTestResourceModel(); | ||
$model->toResource(); | ||
} | ||
|
||
public function testItCanGuessResourceWhenNotProvided() | ||
{ | ||
$model = new EloquentResourceTestResourceModelWithGuessableResource(); | ||
|
||
class_alias(EloquentResourceTestJsonResource::class, 'Illuminate\Tests\Database\Fixtures\Http\Resources\EloquentResourceTestResourceModelWithGuessableResourceResource'); | ||
|
||
$resource = $model->toResource(); | ||
|
||
$this->assertInstanceOf(EloquentResourceTestJsonResource::class, $resource); | ||
$this->assertSame($model, $resource->resource); | ||
} | ||
|
||
public function testItCanGuessResourceName() | ||
{ | ||
$model = new EloquentResourceTestResourceModel(); | ||
$this->assertEquals('Illuminate\Tests\Database\Fixtures\Http\Resources\EloquentResourceTestResourceModelResource', $model::guessResourceName()); | ||
} | ||
} | ||
|
||
class EloquentResourceTestJsonResource extends JsonResource | ||
{ | ||
// | ||
} |
10 changes: 10 additions & 0 deletions
10
tests/Database/Fixtures/Models/EloquentResourceCollectionTestModel.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?php | ||
|
||
namespace Illuminate\Tests\Database\Fixtures\Models; | ||
|
||
use Illuminate\Database\Eloquent\Model; | ||
|
||
class EloquentResourceCollectionTestModel extends Model | ||
{ | ||
// | ||
} |
11 changes: 11 additions & 0 deletions
11
tests/Database/Fixtures/Models/EloquentResourceTestResourceModel.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?php | ||
|
||
namespace Illuminate\Tests\Database\Fixtures\Models; | ||
|
||
use Illuminate\Database\Eloquent\Concerns\HasUlids; | ||
use Illuminate\Database\Eloquent\Model; | ||
|
||
class EloquentResourceTestResourceModel extends Model | ||
{ | ||
// | ||
} |
11 changes: 11 additions & 0 deletions
11
tests/Database/Fixtures/Models/EloquentResourceTestResourceModelWithGuessableResource.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?php | ||
|
||
namespace Illuminate\Tests\Database\Fixtures\Models; | ||
|
||
use Illuminate\Database\Eloquent\Concerns\HasUlids; | ||
use Illuminate\Database\Eloquent\Model; | ||
|
||
class EloquentResourceTestResourceModelWithGuessableResource extends Model | ||
{ | ||
// | ||
} |
11 changes: 11 additions & 0 deletions
11
tests/Pagination/Fixtures/Models/PaginatorResourceTestModel.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?php | ||
|
||
namespace Illuminate\Tests\Pagination\Fixtures\Models; | ||
|
||
use Illuminate\Database\Eloquent\Concerns\HasUlids; | ||
use Illuminate\Database\Eloquent\Model; | ||
|
||
class PaginatorResourceTestModel extends Model | ||
{ | ||
// | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd put each argument on a separate line for consistency