Skip to content
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
4 changes: 3 additions & 1 deletion src/Stache/Stores/CollectionEntriesStore.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ public function getItemFilter(SplFileInfo $file)

if (Site::multiEnabled()) {
[$site, $relative] = explode('/', $relative, 2);
if (! $this->collection()->sites()->contains($site)) {
$collection = $this->collection ?? $this->findCollection($this->childKey);

if (! $collection->sites()->contains($site)) {
return false;
}
}
Expand Down
45 changes: 45 additions & 0 deletions tests/Stache/Stores/EntriesStoreTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Tests\Stache\Stores;

use Facades\Statamic\Stache\Traverser;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Carbon;
use Mockery;
use PHPUnit\Framework\Attributes\DataProvider;
Expand Down Expand Up @@ -56,6 +57,50 @@ public function it_only_looks_up_the_collection_once_when_building_paths()
$this->assertEquals(1, $lookups);
}

#[Test]
public function it_only_looks_up_the_collection_once_when_filtering_files_on_multisite()
{
$this->setSites([
'en' => ['url' => '/'],
'fr' => ['url' => '/fr/'],
'de' => ['url' => '/de/'],
]);

$collection = Facades\Collection::make('multisite_pages')->sites(['en', 'fr']);

$lookups = 0;
Facades\Collection::partialMock()
->shouldReceive('findByHandle')
->with('multisite_pages')
->andReturnUsing(function () use ($collection, &$lookups) {
$lookups++;

return $collection;
});

$dir = Path::tidy(__DIR__.'/tmp-multisite');
foreach (['en', 'fr', 'de'] as $site) {
@mkdir($dir.'/multisite_pages/'.$site, 0777, true);
foreach (['one', 'two'] as $slug) {
file_put_contents($dir.'/multisite_pages/'.$site.'/'.$slug.'.md', "---\nid: $site-$slug\n---\n");
}
}

$store = (new EntriesStore)->directory($dir)->store('multisite_pages');

try {
$this->assertEquals([
$dir.'/multisite_pages/en/one.md',
$dir.'/multisite_pages/en/two.md',
$dir.'/multisite_pages/fr/one.md',
$dir.'/multisite_pages/fr/two.md',
], $store->paths()->values()->sort()->values()->all());
$this->assertEquals(1, $lookups);
} finally {
(new Filesystem)->deleteDirectory($dir);
}
}

#[Test]
public function it_gets_nested_files()
{
Expand Down
Loading