Skip to content

[12.x] Extends AsCollection to map through a closure #55611

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

Closed
wants to merge 1 commit into from
Closed

[12.x] Extends AsCollection to map through a closure #55611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 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 @@ -2,11 +2,13 @@

namespace Illuminate\Database\Eloquent\Casts;

use Closure;
use Illuminate\Contracts\Database\Eloquent\Castable;
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
use Illuminate\Support\Collection;
use Illuminate\Support\Str;
use InvalidArgumentException;
use Laravel\SerializableClosure\SerializableClosure;

class AsCollection implements Castable
{
Expand Down Expand Up @@ -51,6 +53,10 @@ public function get($model, $key, $value, $attributes)

if (is_string($this->arguments[1])) {
$this->arguments[1] = Str::parseCallback($this->arguments[1]);

if (! class_exists($this->arguments[1][0])) {
$this->arguments[1] = @unserialize($this->arguments[1][0])->getClosure();
}
}

return is_callable($this->arguments[1])
Expand All @@ -68,7 +74,7 @@ public function set($model, $key, $value, $attributes)
/**
* Specify the type of object each item in the collection should be mapped to.
*
* @param array{class-string, string}|class-string $map
* @param array{class-string, string}|class-string|Closure $map
* @return string
*/
public static function of($map)
Expand All @@ -80,13 +86,15 @@ public static function of($map)
* Specify the collection type for the cast.
*
* @param class-string $class
* @param array{class-string, string}|class-string $map
* @param array{class-string, string}|class-string|Closure|null $map
* @return string
*/
public static function using($class, $map = null)
{
if (is_array($map) && is_callable($map)) {
$map = $map[0].'@'.$map[1];
} elseif ($map instanceof Closure) {
$map = serialize(new SerializableClosure($map));
}

return static::class.':'.implode(',', [$class, $map]);
Expand Down
12 changes: 10 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 @@ -2,12 +2,14 @@

namespace Illuminate\Database\Eloquent\Casts;

use Closure;
use Illuminate\Contracts\Database\Eloquent\Castable;
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Crypt;
use Illuminate\Support\Str;
use InvalidArgumentException;
use Laravel\SerializableClosure\SerializableClosure;

class AsEncryptedCollection implements Castable
{
Expand Down Expand Up @@ -46,6 +48,10 @@ public function get($model, $key, $value, $attributes)

if (is_string($this->arguments[1])) {
$this->arguments[1] = Str::parseCallback($this->arguments[1]);

if (! class_exists($this->arguments[1][0])) {
$this->arguments[1] = @unserialize($this->arguments[1][0])->getClosure();
}
}

return is_callable($this->arguments[1])
Expand All @@ -67,7 +73,7 @@ public function set($model, $key, $value, $attributes)
/**
* Specify the type of object each item in the collection should be mapped to.
*
* @param array{class-string, string}|class-string $map
* @param array{class-string, string}|class-string|Closure $map
* @return string
*/
public static function of($map)
Expand All @@ -79,13 +85,15 @@ public static function of($map)
* Specify the collection for the cast.
*
* @param class-string $class
* @param array{class-string, string}|class-string $map
* @param array{class-string, string}|class-string|Closure|null $map
* @return string
*/
public static function using($class, $map = null)
{
if (is_array($map) && is_callable($map)) {
$map = $map[0].'@'.$map[1];
} elseif ($map instanceof Closure) {
$map = serialize(new SerializableClosure($map));
}

return static::class.':'.implode(',', [$class, $map]);
Expand Down
31 changes: 31 additions & 0 deletions tests/Integration/Database/DatabaseCustomCastsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,37 @@ public function test_as_custom_collection_with_map_callback(): void
$this->assertInstanceOf(FluentWithCallback::class, $model->collection->first());
$this->assertSame('bar', $model->collection->first()->foo);
}

public function test_as_collection_with_map_using_closure()
{
$model = new TestEloquentModelWithCustomCasts();
$model->mergeCasts([
'collection' => AsCollection::of(fn ($data) => new Fluent($data)),
]);

$model->setRawAttributes([
'collection' => json_encode([['foo' => 'bar']]),
]);

$this->assertInstanceOf(Fluent::class, $model->collection->first());
$this->assertSame('bar', $model->collection->first()->foo);
}

public function test_as_custom_collection_with_map_using_closure()
{
$model = new TestEloquentModelWithCustomCasts();
$model->mergeCasts([
'collection' => AsCollection::using(CustomCollection::class, fn ($data) => new Fluent($data)),
]);

$model->setRawAttributes([
'collection' => json_encode([['foo' => 'bar']]),
]);

$this->assertInstanceOf(CustomCollection::class, $model->collection);
$this->assertInstanceOf(Fluent::class, $model->collection->first());
$this->assertSame('bar', $model->collection->first()->foo);
}
}

class TestEloquentModelWithCustomCasts extends Model
Expand Down