E607 [12.x] Fix `illuminate/database` usage as standalone package (#55309) · laravel/framework@3a93c48 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3a93c48

Browse files
crynobonetaylorotwell
crynobone
and
taylorotwell
authored
[12.x] Fix illuminate/database usage as standalone package (#55309)
* [12.x] Fix `illuminate/database` usage as standalone package Avoid regression issue introduced in #55107 fixes #55272 Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * Update composer.json * Update composer.json --------- Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> Co-authored-by: Taylor Otwell <taylor@laravel.com>
1 parent 267a072 commit 3a93c48

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

‎src/Illuminate/Collections/Traits/TransformsToResourceCollection.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Illuminate\Support\Traits;
44

55
use Illuminate\Database\Eloquent\Model;
6-
use Illuminate\Http\Resources\Json\JsonResource;
76
use Illuminate\Http\Resources\Json\ResourceCollection;
87
use LogicException;
98

@@ -12,8 +11,8 @@ trait TransformsToResourceCollection
1211
/**
1312
* Create a new resource collection instance for the given resource.
1413
*
15-
* @param class-string<JsonResource>|null $resourceClass
16-
* @return ResourceCollection
14+
* @param class-string<\Illuminate\Http\Resources\Json\JsonResource>|null $resourceClass
15+
* @return \Illuminate\Http\Resources\Json\ResourceCollection
1716
*
1817
* @throws \Throwable
1918
*/
@@ -29,7 +28,7 @@ public function toResourceCollection(?string $resourceClass = null): ResourceCol
2928
/**
3029
* Guess the resource collection for the items.
3130
*
32-
* @return ResourceCollection
31+
* @return \Illuminate\Http\Resources\Json\ResourceCollection
3332
*
3433
* @throws \Throwable
3534
*/

‎src/Illuminate/Collections/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
}
3535
},
3636
"suggest": {
37+
"illuminate/http": "Required to convert collections to API resources (^12.0).",
3738
"symfony/var-dumper": "Required to use the dump method (^7.2)."
3839
},
3940
"config": {

‎src/Illuminate/Http/Resources/TransformsToResource.php renamed to ‎src/Illuminate/Database/Eloquent/Concerns/TransformsToResource.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Illuminate\Http\Resources;
3+
namespace Illuminate\Database\Eloquent\Concerns;
44

55
use Illuminate\Http\Resources\Json\JsonResource;
66
use Illuminate\Support\Str;
@@ -11,8 +11,8 @@ trait TransformsToResource
1111
/**
1212
* Create a new resource object for the given resource.
1313
*
14-
* @param class-string<JsonResource>|null $resourceClass
15-
* @return JsonResource
14+
* @param class-string<\Illuminate\Http\Resources\Json\JsonResource>|null $resourceClass
15+
* @return \Illuminate\Http\Resources\Json\JsonResource
1616
*
1717
* @throws \Throwable
1818
*/
@@ -28,7 +28,7 @@ public function toResource(?string $resourceClass = null): JsonResource
2828
/**
2929
* Guess the resource class for the model.
3030
*
31-
* @return JsonResource
31+
* @return \Illuminate\Http\Resources\Json\JsonResource
3232
*
3333
* @throws \Throwable
3434
*/
@@ -46,7 +46,7 @@ protected function guessResource(): JsonResource
4646
/**
4747
* Guess the resource class name for the model.
4848
*
49-
* @return array<class-string<JsonResource>>
49+
* @return array<class-string<\Illuminate\Http\Resources\Json\JsonResource>>
5050
*/
5151
public static function guessResourceName(): array
5252
{

‎src/Illuminate/Database/Eloquent/Model.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Illuminate\Database\Eloquent\Relations\Concerns\AsPivot;
1818
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
1919
use Illuminate\Database\Eloquent\Relations\Pivot;
20-
use Illuminate\Http\Resources\TransformsToResource;
2120
use Illuminate\Support\Arr;
2221
use Illuminate\Support\Collection as BaseCollection;
2322
use Illuminate\Support\Str;
@@ -40,8 +39,8 @@ abstract class Model implements Arrayable, ArrayAccess, CanBeEscapedWhenCastToSt
4039
Concerns\HidesAttributes,
4140
Concerns\GuardsAttributes,
4241
Concerns\PreventsCircularRecursion,
43-
ForwardsCalls,
44-
TransformsToResource;
42+
Concerns\TransformsToResource,
43+
ForwardsCalls;
4544
/** @use HasCollection<\Illuminate\Database\Eloquent\Collection<array-key, static & self>> */
4645
use HasCollection;
4746

‎src/Illuminate/Database/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"illuminate/console": "Required to use the database commands (^12.0).",
4242
"illuminate/events": "Required to use the observers with Eloquent (^12.0).",
4343
"illuminate/filesystem": "Required to use the migrations (^12.0).",
44+
"illuminate/http": "Required to convert Eloquent models to API resources (^12.0).",
4445
"illuminate/pagination": "Required to paginate the result set (^12.0).",
4546
"symfony/finder": "Required to use Eloquent model factories (^7.2)."
4647
},

0 commit comments

Comments
 (0)
0