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.

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

Allowing collection to be created passing null #507

Merged
merged 1 commit into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Concerns/BaseData.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static function pipeline(): DataPipeline
->through(CastPropertiesDataPipe::class);
}

public static function collection(Enumerable|array|AbstractPaginator|Paginator|AbstractCursorPaginator|CursorPaginator|DataCollection $items): DataCollection|CursorPaginatedDataCollection|PaginatedDataCollection
public static function collection(Enumerable|array|AbstractPaginator|Paginator|AbstractCursorPaginator|CursorPaginator|DataCollection|null $items): DataCollection|CursorPaginatedDataCollection|PaginatedDataCollection
{
if ($items instanceof Paginator || $items instanceof AbstractPaginator) {
return new (static::$_paginatedCollectionClass)(static::class, $items);
Expand Down
2 changes: 1 addition & 1 deletion src/Contracts/BaseData.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static function withoutMagicalCreationFrom(mixed ...$payloads): static;
*
* @return ($items is \Illuminate\Pagination\AbstractCursorPaginator|\Illuminate\Pagination\CursorPaginator ? \Spatie\LaravelData\CursorPaginatedDataCollection<array-key, static> : ($items is \Illuminate\Pagination\Paginator|\Illuminate\Pagination\AbstractPaginator ? \Spatie\LaravelData\PaginatedDataCollection<array-key, static> : \Spatie\LaravelData\DataCollection<array-key, static>))
*/
public static function collection(Enumerable|array|AbstractPaginator|Paginator|AbstractCursorPaginator|CursorPaginator|DataCollection $items): DataCollection|CursorPaginatedDataCollection|PaginatedDataCollection;
public static function collection(Enumerable|array|AbstractPaginator|Paginator|AbstractCursorPaginator|CursorPaginator|DataCollection|null $items): DataCollection|CursorPaginatedDataCollection|PaginatedDataCollection;

public static function normalizers(): array;

Expand Down
4 changes: 2 additions & 2 deletions src/DataCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ class DataCollection implements DataCollectable, ArrayAccess
*/
public function __construct(
public readonly string $dataClass,
Enumerable|array|DataCollection $items
Enumerable|array|DataCollection|null $items
) {
if (is_array($items)) {
if (is_array($items) || is_null($items)) {
$items = new Collection($items);
}

Expand Down
7 changes: 7 additions & 0 deletions tests/DataCollectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -529,3 +529,10 @@ function (string $operation, array $arguments, array $expected) {
expect($invaded->_except)->toBeEmpty();
expect($invaded->_wrap)->toBeNull();
});

it('can create an empty collection passing null', function () {
$collection = SimpleData::collection(null);

expect($collection)->toBeInstanceOf(DataCollection::class);
expect($collection->toJson())->toBe('[]');
});
Loading