Skip to content

Let count, length, and pluck modifiers handle query builders #5368

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

Merged
jasonvarga merged 1 commit into from
Feb 28, 2022
Merged

Let count, length, and pluck modifiers handle query builders #5368

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
13 changes: 13 additions & 0 deletions src/Modifiers/CoreModifiers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Statamic\Contracts\Data\Augmentable;
use Statamic\Facades\Antlers;
use Statamic\Facades\Asset;
use Statamic\Facades\Compare;
use Statamic\Facades\Config;
use Statamic\Facades\Data;
use Statamic\Facades\File;
Expand Down Expand Up @@ -353,6 +354,10 @@ public function containsAny($value, $params)
*/
public function count($value, $params)
{
if (Compare::isQueryBuilder($value)) {
return $value->count();
}

return count($value);
}

Expand Down Expand Up @@ -1272,6 +1277,10 @@ public function lcfirst($value)
*/
public function length($value)
{
if (Compare::isQueryBuilder($value)) {
return $value->count();
}

if ($value instanceof Arrayable) {
$value = $value->toArray();
}
Expand Down Expand Up @@ -1636,6 +1645,10 @@ public function pluck($value, $params)
$value = collect($value);
}

if (Compare::isQueryBuilder($value)) {
$value = $value->get();
}

$items = $value->map(function ($item) use ($key) {
if (is_array($item)) {
return Arr::get($item, $key);
Expand Down
17 changes: 17 additions & 0 deletions tests/Modifiers/PluckTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
namespace Tests\Modifiers;

use Illuminate\Support\Collection;
use Mockery;
use Statamic\Contracts\Query\Builder;
use Statamic\Data\ContainsData;
use Statamic\Data\HasOrigin;
use Statamic\Entries\EntryCollection;
Expand Down Expand Up @@ -40,6 +42,21 @@ public function it_plucks_values_from_collections_of_items()
$this->assertEquals(['food', 'drink'], $modified->all());
}

/** @test */
public function it_plucks_values_from_query_builder()
{
$builder = Mockery::mock(Builder::class);
$builder->shouldReceive('get')->andReturn(Collection::make($this->items()));

$modified = $this->modify($builder, 'title');
$this->assertInstanceOf(Collection::class, $modified);
$this->assertEquals(['Bread', 'Coffee'], $modified->all());

$modified = $this->modify($builder, 'type');
$this->assertInstanceOf(Collection::class, $modified);
$this->assertEquals(['food', 'drink'], $modified->all());
}

/** @test */
public function it_plucks_values_from_array_of_items_with_origins()
{
Expand Down