Skip to content
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.

Sign up for GitHub

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

[10.x] Add ability to set a custom class for the AsCollection and AsEncryptedCollection casts #46619

Merged
merged 11 commits into from
Apr 3, 2023
Merged

[10.x] Add ability to set a custom class for the AsCollection and AsEncryptedCollection casts #46619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
21ee3f2
Add ability to set a custom collection class for the `AsCollection` cast
osbre Mar 28, 2023
afc034d
Fix StyleCI
osbre Mar 28, 2023
fe3f218
Pass all arguments instead of a collection class name
osbre Mar 28, 2023
f66e600
Ability to set a custom collection class in `AsEncryptedCollection` cast
osbre Mar 28, 2023
99c1465
Add check for a collection class
osbre Mar 29, 2023
f39650b
Revert "Add check for a collection class"
osbre Mar 29, 2023
0a623fc
Switch to PHP 8 constructor property promotion syntax
osbre Mar 31, 2023
9e7295f
Add check for a collection class
osbre Mar 31, 2023
448eaa3
formatting
taylorotwell Apr 3, 2023
2cc5dfa
Update AsCollection.php
taylorotwell Apr 3, 2023
4c9cc22
Update AsEncryptedCollection.php
taylorotwell Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/Illuminate/Database/Eloquent/Casts/AsCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Illuminate\Contracts\Database\Eloquent\Castable;
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
use Illuminate\Support\Collection;
use InvalidArgumentException;

class AsCollection implements Castable
{
Expand All @@ -16,8 +17,12 @@ class AsCollection implements Castable
*/
public static function castUsing(array $arguments)
{
return new class implements CastsAttributes
return new class($arguments) implements CastsAttributes
{
public function __construct(protected array $arguments)
{
}

public function get($model, $key, $value, $attributes)
{
if (! isset($attributes[$key])) {
Expand All @@ -26,7 +31,13 @@ public function get($model, $key, $value, $attributes)

$data = Json::decode($attributes[$key]);

return is_array($data) ? new Collection($data) : null;
$collectionClass = $this->arguments[0] ?? Collection::class;
osbre marked this conversation as resolved.
Show resolved Hide resolved

if (! is_a($collectionClass, Collection::class, true)) {
throw new InvalidArgumentException('The provided class must extend ['.Collection::class.'].');
}

return is_array($data) ? new $collectionClass($data) : null;
}

public function set($model, $key, $value, $attributes)
Expand Down
15 changes: 13 additions & 2 deletions src/Illuminate/Database/Eloquent/Casts/AsEncryptedCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Crypt;
use InvalidArgumentException;

class AsEncryptedCollection implements Castable
{
Expand All @@ -17,12 +18,22 @@ class AsEncryptedCollection implements Castable
*/
public static function castUsing(array $arguments)
{
return new class implements CastsAttributes
return new class($arguments) implements CastsAttributes
{
public function __construct(protected array $arguments)
{
}

public function get($model, $key, $value, $attributes)
{
$collectionClass = $this->arguments[0] ?? Collection::class;
osbre marked this conversation as resolved.
Show resolved Hide resolved

if (! is_a($collectionClass, Collection::class, true)) {
throw new InvalidArgumentException('The provided class must extend ['.Collection::class.'].');
}

if (isset($attributes[$key])) {
return new Collection(Json::decode(Crypt::decryptString($attributes[$key])));
return new $collectionClass(Json::decode(Crypt::decryptString($attributes[$key])));
}

return null;
Expand Down