[5.x] Cache entry uri#9844

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 18 commits into from
Apr 29, 2024
Merged

[5.x] Cache entry uri #9844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0cfc2e1
allow caching of uri to property, and set it up front so it gets cached.
jasonvarga Apr 8, 2024
74f01a2
Merge branch 'master' into entry-uri
jasonvarga Apr 10, 2024
e1aef40
Merge branch 'master' into entry-uri
jasonvarga Apr 22, 2024
95be09a
Merge branch 'master' into entry-uri
jasonvarga Apr 22, 2024
f9cffe0
Merge branch 'master' into entry-uri
jasonvarga Apr 23, 2024
e0d2e86
use blink and reset appropriately
jasonvarga Apr 23, 2024
add8255
mock
jasonvarga Apr 23, 2024
88d1159
compare ids since the objects arent technically identical (computedCa…
jasonvarga Apr 23, 2024
7ae2be0
set the handles otherwise you get an error when it tries to do a look…
jasonvarga Apr 23, 2024
1deddc3
cache the uri along with the entry.
jasonvarga Apr 24, 2024
fdc19f0
Merge branch 'master' into entry-uri
jasonvarga Apr 26, 2024
bba4d75
Merge branch 'master' into entry-uri
jasonvarga Apr 26, 2024
6ba8099
Fix test by moving the tag before content creation ...
jasonvarga Apr 29, 2024
0664168
ditto
jasonvarga Apr 29, 2024
972ee90
the cached item is now an array and the entry is one of the values.
jasonvarga Apr 29, 2024
1a76cff
Fix this test ...
jasonvarga Apr 29, 2024
f740018
compare ids. the objects might be have different properties - like th…
jasonvarga Apr 29, 2024
0f90874
when entries are saved, update them in the stache
jasonvarga Apr 29, 2024
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
20 changes: 17 additions & 3 deletions src/Entries/Entry.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,7 @@ public function save()
Facades\Entry::save($this);

if ($this->id()) {
Blink::store('entry-uris')->forget($this->id());
Blink::store('structure-uris')->forget($this->id());
Blink::store('structure-entries')->forget($this->id());
Blink::forget($this->getOriginBlinkKey());
Expand DownExpand Up@@ -876,15 +877,23 @@ public function routeData()

public function uri()
{
if ($this->id() && Blink::store('entry-uris')->has($this->id())) {
return Blink::store('entry-uris')->get($this->id());
}

if (! $this->route()) {
return null;
}

if ($structure = $this->structure()) {
return $structure->entryUri($this);
$uri = ($structure = $this->structure())
? $structure->entryUri($this)
: $this->routableUri();

if ($uri && $this->id()) {
Blink::store('entry-uris')->put($this->id(), $uri);
}

return $this->routableUri();
return $uri;
}

public function fileExtension()
Expand DownExpand Up@@ -1011,6 +1020,11 @@ public function getQueryableValue(string $field)
return $this->value('authors');
}

// Reset the cached uri so it gets recalculated.
if ($field === 'uri') {
Blink::store('entry-uris')->forget($this->id());
}

if (method_exists($this, $method = Str::camel($field))) {
return $this->{$method}();
}
Expand Down
2 changes: 2 additions & 0 deletions src/Stache/Repositories/EntryRepository.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Entries\EntryCollection;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Exceptions\EntryNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Rules\Slug;
use Statamic\Stache\Query\EntryQueryBuilder;
Expand DownExpand Up@@ -151,6 +152,7 @@ public static function bindings(): array

public function substitute($item)
{
Blink::store('entry-uris')->forget($item->id());
$this->substitutionsById[$item->id()] = $item;
$this->substitutionsByUri[$item->locale().'@'.$item->uri()] = $item;
}
Expand Down
40 changes: 40 additions & 0 deletions src/Stache/Stores/CollectionEntriesStore.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,12 @@

namespace Statamic\Stache\Stores;

use Illuminate\Support\Facades\Cache;
use Statamic\Entries\GetDateFromPath;
use Statamic\Entries\GetSlugFromPath;
use Statamic\Entries\GetSuffixFromPath;
use Statamic\Entries\RemoveSuffixFromPath;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\File;
Expand All@@ -20,6 +22,7 @@
class CollectionEntriesStore extends ChildStore
{
protected $collection;
private bool $shouldBlinkEntryUris = true;

protected function collection()
{
Expand DownExpand Up@@ -95,6 +98,10 @@ public function makeItemFromFile($path, $contents)
$entry->date((new GetDateFromPath)($path));
}

// Blink the entry so that it can be used when building the URI. If it's not
// in there, it would try to retrieve the entry, which doesn't exist yet.
Blink::store('structure-entries')->put($id, $entry);

if (isset($idGenerated) || isset($positionGenerated)) {
$this->writeItemToDiskWithoutIncrementing($entry);
}
Expand DownExpand Up@@ -217,4 +224,37 @@ protected function writeItemToDisk($item)

$item->writeFile($path);
}

protected function cacheItem($item)
{
$key = $this->getItemKey($item);

$cacheKey = $this->getItemCacheKey($key);

Cache::forever($cacheKey, ['entry' => $item, 'uri' => $item->uri()]);
}

protected function getCachedItem($key)
{
$cacheKey = $this->getItemCacheKey($key);

if (! $cache = Cache::get($cacheKey)) {
return null;
}

if ($this->shouldBlinkEntryUris && $cache['uri']) {
Blink::store('entry-uris')->put($cache['entry']->id(), $cache['uri']);
}

return $cache['entry'];
}

public function withoutBlinkingEntryUris($callback)
{
$this->shouldBlinkEntryUris = false;
$return = $callback();
$this->shouldBlinkEntryUris = true;

return $return;
}
}
17 changes: 13 additions & 4 deletions src/Stache/Stores/CollectionsStore.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,20 @@ protected function getDefaultPublishState($data)

public function updateEntryUris($collection, $ids = null)
{
$index = Stache::store('entries')
->store($collection->handle())
->index('uri');
$store = Stache::store('entries')->store($collection->handle());
$this->updateEntriesWithinIndex($store->index('uri'), $ids);
$this->updateEntriesWithinStore($store, $ids);
}

$this->updateEntriesWithinIndex($index, $ids);
private function updateEntriesWithinStore($store, $ids)
{
if (empty($ids)) {
$ids = $store->paths()->keys();
}

$entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

$entries->each(fn ($entry) => $store->cacheItem($entry));
}

public function updateEntryOrder($collection, $ids = null)
Expand Down
4 changes: 2 additions & 2 deletions tests/Antlers/Runtime/PartialsTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function test_sections_work_inside_the_main_slot_content()
{
Collection::make('pages')->routes('{slug}')->save();

EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('/')->create();
EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('test')->create();

$layout = <<<'LAYOUT'
{{ yield:test }}
Expand All@@ -59,7 +59,7 @@ public function test_sections_work_inside_the_main_slot_content()
$this->viewShouldReturnRaw('default', $default);
$this->viewShouldReturnRaw('test', $partial);

$response = $this->get('/')->assertOk();
$response = $this->get('test')->assertOk();
$content = trim(StringUtilities::normalizeLineEndings($response->content()));

$expected = <<<'EXPECTED'
Expand Down
20 changes: 10 additions & 10 deletions tests/Antlers/Runtime/RuntimeValuesTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,6 @@ public function test_supplemented_values_are_not_cached()
{
$this->withFakeViews();

Collection::make('pages')->routes(['en' => '{slug}'])->save();
EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

$template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

$instance = (new class extends Tags
{
public static $handle = 'dont_cache';
Expand All@@ -49,6 +39,16 @@ public function mePlease()

$instance::register();

Collection::make('pages')->routes(['en' => '{slug}'])->save();
EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

$template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

$this->viewShouldReturnRaw('default', $template);
$this->viewShouldReturnRaw('layout', '{{ template_content }}');

Expand Down
7 changes: 4 additions & 3 deletions tests/Antlers/Runtime/TagCheckScopeTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,9 +132,6 @@ public function test_node_processor_does_not_trash_scope_when_checking_if_someth

public function test_condition_augmentation_doesnt_reset_up_the_scope()
{
$this->createData();
$this->withFakeViews();

(new class extends Tags
{
public static $handle = 'just_a_tag';
Expand All@@ -144,6 +141,10 @@ public function index()
return [];
}
})::register();

$this->createData();
$this->withFakeViews();

$template = <<<'EOT'

{{ just_a_tag }}
Expand Down
11 changes: 6 additions & 5 deletions tests/Data/Entries/EntryTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -637,8 +637,6 @@ public function a_localized_entry_in_a_structured_collection_without_a_route_for
*/
public function it_gets_urls_for_first_child_redirects($value)
{
\Event::fake(); // Don't invalidate static cache etc when saving entries.

$this->setSites([
'en' => ['url' => 'http://domain.com/', 'locale' => 'en_US'],
]);
Expand DownExpand Up@@ -1356,7 +1354,7 @@ public function when_saving_quietly_the_cached_entrys_withEvents_flag_will_be_se

$entry->saveQuietly();

$cached = Cache::get('stache::items::entries::blog::1');
$cached = Cache::get('stache::items::entries::blog::1')['entry'];
$reflection = new ReflectionClass($cached);
$property = $reflection->getProperty('withEvents');
$property->setAccessible(true);
Expand All@@ -1375,8 +1373,11 @@ public function it_clears_blink_caches_when_saving()
$mock->shouldReceive('store')->with('structure-uris')->once()->andReturn(
$this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
);
$mock->shouldReceive('store')->with('structure-entries')->once()->andReturn(
$this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
$mock->shouldReceive('store')->with('structure-entries')->twice()->andReturn(
tap($this->mock(\Spatie\Blink\Blink::class), function ($m) {
$m->shouldReceive('forget')->with('a')->once();
$m->shouldReceive('put')->once();
})
);

$entry->save();
Expand Down
2 changes: 1 addition & 1 deletion tests/Data/Structures/TreeTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ public function it_gets_the_parent()
$parent = $tree->parent();

$this->assertInstanceOf(Page::class, $parent);
$this->assertEquals(Entry::find('pages-home'), $parent->entry());
$this->assertEquals(Entry::find('pages-home')->id(), $parent->entry()->id());
}

/** @test */
Expand Down
12 changes: 6 additions & 6 deletions tests/Feature/Entries/MountingTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ public function updating_a_mounted_page_will_update_the_uris_for_each_entry_in_t
$one = EntryFactory::collection('blog')->slug('one')->create();
$two = EntryFactory::collection('blog')->slug('two')->create();

$this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
$this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
$this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
$this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

$mount->slug('diary')->save();

$this->assertNull(Entry::findByUri('/pages/blog/one'));
$this->assertNull(Entry::findByUri('/pages/blog/two'));
$this->assertEquals($one, Entry::findByUri('/pages/diary/one'));
$this->assertEquals($two, Entry::findByUri('/pages/diary/two'));
$this->assertEquals($one->id(), Entry::findByUri('/pages/diary/one')->id());
$this->assertEquals($two->id(), Entry::findByUri('/pages/diary/two')->id());
}

/** @test */
Expand All@@ -54,8 +54,8 @@ public function updating_a_mounted_page_will_not_update_the_uris_when_slug_is_cl
$one = EntryFactory::collection('blog')->slug('one')->create();
$two = EntryFactory::collection('blog')->slug('two')->create();

$this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
$this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
$this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
$this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

// Since we're just saving the mount without changing the slug, we don't want to update the URIs.
$mock = \Mockery::mock(Collection::getFacadeRoot())->makePartial();
Expand Down
6 changes: 3 additions & 3 deletions tests/Stache/Stores/EntriesStoreTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ public function it_makes_entry_instances_from_files()
public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
{
Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
(new \Statamic\Entries\Collection)->requiresSlugs(false)
(new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
);

$item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -122,7 +122,7 @@ public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id_then_slug_is_null()
{
Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
(new \Statamic\Entries\Collection)->requiresSlugs(false)
(new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
);

$item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -138,7 +138,7 @@ public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id
public function if_slugs_are_required_and_the_filename_is_the_same_as_the_id_then_slug_is_the_id()
{
Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
(new \Statamic\Entries\Collection)->requiresSlugs(true)
(new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(true)
);

$item = $this->parent->store('blog')->makeItemFromFile(
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[5.x] Cache entry uri#9844

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 18 commits into

from

Apr 29, 2024
 Merged


[5.x] Cache entry uri
#9844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
0cfc2e1

allow caching of uri to property, and set it up front so it gets cached.


jasonvarga Apr 8, 2024
74f01a2

Merge branch 'master' into entry-uri


jasonvarga Apr 10, 2024
e1aef40

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
95be09a

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
f9cffe0

Merge branch 'master' into entry-uri


jasonvarga Apr 23, 2024
e0d2e86

use blink and reset appropriately


jasonvarga Apr 23, 2024
add8255

mock


jasonvarga Apr 23, 2024
88d1159

compare ids since the objects arent technically identical (computedCa…


jasonvarga Apr 23, 2024
7ae2be0

set the handles otherwise you get an error when it tries to do a look…


jasonvarga Apr 23, 2024
1deddc3

cache the uri along with the entry.


jasonvarga Apr 24, 2024
fdc19f0

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
bba4d75

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
6ba8099

Fix test by moving the tag before content creation ...


jasonvarga Apr 29, 2024
0664168

ditto


jasonvarga Apr 29, 2024
972ee90

the cached item is now an array and the entry is one of the values.


jasonvarga Apr 29, 2024
1a76cff

Fix this test ...


jasonvarga Apr 29, 2024
f740018

compare ids. the objects might be have different properties - like th…


jasonvarga Apr 29, 2024
0f90874

when entries are saved, update them in the stache


jasonvarga Apr 29, 2024

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


20 changes: 17 additions & 3 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,7 @@ public function save()
 Facades\Entry::save($this);

 if ($this->id()) {
 Blink::store('entry-uris')->forget($this->id());
 Blink::store('structure-uris')->forget($this->id());
 Blink::store('structure-entries')->forget($this->id());
 Blink::forget($this->getOriginBlinkKey());
Expand DownExpand Up@@ -876,15 +877,23 @@ public function routeData()

 public function uri()
 {
 if ($this->id() && Blink::store('entry-uris')->has($this->id())) {
 return Blink::store('entry-uris')->get($this->id());
 }

 if (! $this->route()) {
 return null;
 }

 if ($structure = $this->structure()) {
 return $structure->entryUri($this);
 $uri = ($structure = $this->structure())
 ? $structure->entryUri($this)
 : $this->routableUri();

 if ($uri && $this->id()) {
 Blink::store('entry-uris')->put($this->id(), $uri);
 }

 return $this->routableUri();
 return $uri;
 }

 public function fileExtension()
Expand DownExpand Up@@ -1011,6 +1020,11 @@ public function getQueryableValue(string $field)
 return $this->value('authors');
 }

 // Reset the cached uri so it gets recalculated.
 if ($field === 'uri') {
 Blink::store('entry-uris')->forget($this->id());
 }

 if (method_exists($this, $method = Str::camel($field))) {
 return $this->{$method}();
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Entries\EntryCollection;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Exceptions\EntryNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Rules\Slug;
use Statamic\Stache\Query\EntryQueryBuilder;
Expand DownExpand Up@@ -151,6 +152,7 @@ public static function bindings(): array

 public function substitute($item)
 {
 Blink::store('entry-uris')->forget($item->id());
 $this->substitutionsById[$item->id()] = $item;
 $this->substitutionsByUri[$item->locale().'@'.$item->uri()] = $item;
 }
Expand Down

40 changes: 40 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,12 @@

namespace Statamic\Stache\Stores;

use Illuminate\Support\Facades\Cache;
use Statamic\Entries\GetDateFromPath;
use Statamic\Entries\GetSlugFromPath;
use Statamic\Entries\GetSuffixFromPath;
use Statamic\Entries\RemoveSuffixFromPath;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\File;
Expand All@@ -20,6 +22,7 @@
class CollectionEntriesStore extends ChildStore
{
 protected $collection;
 private bool $shouldBlinkEntryUris = true;

 protected function collection()
 {
Expand DownExpand Up@@ -95,6 +98,10 @@ public function makeItemFromFile($path, $contents)
 $entry->date((new GetDateFromPath)($path));
 }

 // Blink the entry so that it can be used when building the URI. If it's not
 // in there, it would try to retrieve the entry, which doesn't exist yet.
 Blink::store('structure-entries')->put($id, $entry);

 if (isset($idGenerated) || isset($positionGenerated)) {
 $this->writeItemToDiskWithoutIncrementing($entry);
 }
Expand DownExpand Up@@ -217,4 +224,37 @@ protected function writeItemToDisk($item)

 $item->writeFile($path);
 }

 protected function cacheItem($item)
 {
 $key = $this->getItemKey($item);

 $cacheKey = $this->getItemCacheKey($key);

 Cache::forever($cacheKey, ['entry' => $item, 'uri' => $item->uri()]);
 }

 protected function getCachedItem($key)
 {
 $cacheKey = $this->getItemCacheKey($key);

 if (! $cache = Cache::get($cacheKey)) {
 return null;
 }

 if ($this->shouldBlinkEntryUris && $cache['uri']) {
 Blink::store('entry-uris')->put($cache['entry']->id(), $cache['uri']);
 }

 return $cache['entry'];
 }

 public function withoutBlinkingEntryUris($callback)
 {
 $this->shouldBlinkEntryUris = false;
 $return = $callback();
 $this->shouldBlinkEntryUris = true;

 return $return;
 }
}

17 changes: 13 additions & 4 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,20 @@ protected function getDefaultPublishState($data)

 public function updateEntryUris($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('uri');
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 $this->updateEntriesWithinIndex($index, $ids);
 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
Expand Down

4 changes: 2 additions & 2 deletions
tests/Antlers/Runtime/PartialsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function test_sections_work_inside_the_main_slot_content()
 {
 Collection::make('pages')->routes('{slug}')->save();

 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('/')->create();
 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('test')->create();

 $layout = <<<'LAYOUT'
{{ yield:test }}
Expand All@@ -59,7 +59,7 @@ public function test_sections_work_inside_the_main_slot_content()
 $this->viewShouldReturnRaw('default', $default);
 $this->viewShouldReturnRaw('test', $partial);

 $response = $this->get('/')->assertOk();
 $response = $this->get('test')->assertOk();
 $content = trim(StringUtilities::normalizeLineEndings($response->content()));

 $expected = <<<'EXPECTED'
Expand Down

20 changes: 10 additions & 10 deletions
tests/Antlers/Runtime/RuntimeValuesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,6 @@ public function test_supplemented_values_are_not_cached()
 {
 $this->withFakeViews();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $instance = (new class extends Tags
 {
 public static $handle = 'dont_cache';
Expand All@@ -49,6 +39,16 @@ public function mePlease()

 $instance::register();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $this->viewShouldReturnRaw('default', $template);
 $this->viewShouldReturnRaw('layout', '{{ template_content }}');

Expand Down

7 changes: 4 additions & 3 deletions
tests/Antlers/Runtime/TagCheckScopeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,9 +132,6 @@ public function test_node_processor_does_not_trash_scope_when_checking_if_someth

 public function test_condition_augmentation_doesnt_reset_up_the_scope()
 {
 $this->createData();
 $this->withFakeViews();

 (new class extends Tags
 {
 public static $handle = 'just_a_tag';
Expand All@@ -144,6 +141,10 @@ public function index()
 return [];
 }
 })::register();

 $this->createData();
 $this->withFakeViews();

 $template = <<<'EOT'

{{ just_a_tag }}
Expand Down

11 changes: 6 additions & 5 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -637,8 +637,6 @@ public function a_localized_entry_in_a_structured_collection_without_a_route_for
 */
 public function it_gets_urls_for_first_child_redirects($value)
 {
 \Event::fake(); // Don't invalidate static cache etc when saving entries.

 $this->setSites([
 'en' => ['url' => 'http://domain.com/', 'locale' => 'en_US'],
 ]);
Expand DownExpand Up@@ -1356,7 +1354,7 @@ public function when_saving_quietly_the_cached_entrys_withEvents_flag_will_be_se

 $entry->saveQuietly();

 $cached = Cache::get('stache::items::entries::blog::1');
 $cached = Cache::get('stache::items::entries::blog::1')['entry'];
 $reflection = new ReflectionClass($cached);
 $property = $reflection->getProperty('withEvents');
 $property->setAccessible(true);
Expand All@@ -1375,8 +1373,11 @@ public function it_clears_blink_caches_when_saving()
 $mock->shouldReceive('store')->with('structure-uris')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 );
 $mock->shouldReceive('store')->with('structure-entries')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 $mock->shouldReceive('store')->with('structure-entries')->twice()->andReturn(
 tap($this->mock(\Spatie\Blink\Blink::class), function ($m) {
 $m->shouldReceive('forget')->with('a')->once();
 $m->shouldReceive('put')->once();
 })
 );

 $entry->save();
Expand Down

2 changes: 1 addition & 1 deletion
tests/Data/Structures/TreeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ public function it_gets_the_parent()
 $parent = $tree->parent();

 $this->assertInstanceOf(Page::class, $parent);
 $this->assertEquals(Entry::find('pages-home'), $parent->entry());
 $this->assertEquals(Entry::find('pages-home')->id(), $parent->entry()->id());
 }

 /** @test */
Expand Down

12 changes: 6 additions & 6 deletions
tests/Feature/Entries/MountingTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ public function updating_a_mounted_page_will_update_the_uris_for_each_entry_in_t
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 $mount->slug('diary')->save();

 $this->assertNull(Entry::findByUri('/pages/blog/one'));
 $this->assertNull(Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one, Entry::findByUri('/pages/diary/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/diary/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/diary/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/diary/two')->id());
 }

 /** @test */
Expand All@@ -54,8 +54,8 @@ public function updating_a_mounted_page_will_not_update_the_uris_when_slug_is_cl
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 // Since we're just saving the mount without changing the slug, we don't want to update the URIs.
 $mock = \Mockery::mock(Collection::getFacadeRoot())->makePartial();
Expand Down

6 changes: 3 additions & 3 deletions
tests/Stache/Stores/EntriesStoreTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ public function it_makes_entry_instances_from_files()
 public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -122,7 +122,7 @@ public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id_then_slug_is_null()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -138,7 +138,7 @@ public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id
 public function if_slugs_are_required_and_the_filename_is_the_same_as_the_id_then_slug_is_the_id()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(true)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(true)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[5.x] Cache entry uri#9844

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 18 commits into

from

Apr 29, 2024
 Merged


[5.x] Cache entry uri
#9844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
0cfc2e1

allow caching of uri to property, and set it up front so it gets cached.


jasonvarga Apr 8, 2024
74f01a2

Merge branch 'master' into entry-uri


jasonvarga Apr 10, 2024
e1aef40

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
95be09a

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
f9cffe0

Merge branch 'master' into entry-uri


jasonvarga Apr 23, 2024
e0d2e86

use blink and reset appropriately


jasonvarga Apr 23, 2024
add8255

mock


jasonvarga Apr 23, 2024
88d1159

compare ids since the objects arent technically identical (computedCa…


jasonvarga Apr 23, 2024
7ae2be0

set the handles otherwise you get an error when it tries to do a look…


jasonvarga Apr 23, 2024
1deddc3

cache the uri along with the entry.


jasonvarga Apr 24, 2024
fdc19f0

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
bba4d75

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
6ba8099

Fix test by moving the tag before content creation ...


jasonvarga Apr 29, 2024
0664168

ditto


jasonvarga Apr 29, 2024
972ee90

the cached item is now an array and the entry is one of the values.


jasonvarga Apr 29, 2024
1a76cff

Fix this test ...


jasonvarga Apr 29, 2024
f740018

compare ids. the objects might be have different properties - like th…


jasonvarga Apr 29, 2024
0f90874

when entries are saved, update them in the stache


jasonvarga Apr 29, 2024

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


20 changes: 17 additions & 3 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,7 @@ public function save()
 Facades\Entry::save($this);

 if ($this->id()) {
 Blink::store('entry-uris')->forget($this->id());
 Blink::store('structure-uris')->forget($this->id());
 Blink::store('structure-entries')->forget($this->id());
 Blink::forget($this->getOriginBlinkKey());
Expand DownExpand Up@@ -876,15 +877,23 @@ public function routeData()

 public function uri()
 {
 if ($this->id() && Blink::store('entry-uris')->has($this->id())) {
 return Blink::store('entry-uris')->get($this->id());
 }

 if (! $this->route()) {
 return null;
 }

 if ($structure = $this->structure()) {
 return $structure->entryUri($this);
 $uri = ($structure = $this->structure())
 ? $structure->entryUri($this)
 : $this->routableUri();

 if ($uri && $this->id()) {
 Blink::store('entry-uris')->put($this->id(), $uri);
 }

 return $this->routableUri();
 return $uri;
 }

 public function fileExtension()
Expand DownExpand Up@@ -1011,6 +1020,11 @@ public function getQueryableValue(string $field)
 return $this->value('authors');
 }

 // Reset the cached uri so it gets recalculated.
 if ($field === 'uri') {
 Blink::store('entry-uris')->forget($this->id());
 }

 if (method_exists($this, $method = Str::camel($field))) {
 return $this->{$method}();
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Entries\EntryCollection;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Exceptions\EntryNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Rules\Slug;
use Statamic\Stache\Query\EntryQueryBuilder;
Expand DownExpand Up@@ -151,6 +152,7 @@ public static function bindings(): array

 public function substitute($item)
 {
 Blink::store('entry-uris')->forget($item->id());
 $this->substitutionsById[$item->id()] = $item;
 $this->substitutionsByUri[$item->locale().'@'.$item->uri()] = $item;
 }
Expand Down

40 changes: 40 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,12 @@

namespace Statamic\Stache\Stores;

use Illuminate\Support\Facades\Cache;
use Statamic\Entries\GetDateFromPath;
use Statamic\Entries\GetSlugFromPath;
use Statamic\Entries\GetSuffixFromPath;
use Statamic\Entries\RemoveSuffixFromPath;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\File;
Expand All@@ -20,6 +22,7 @@
class CollectionEntriesStore extends ChildStore
{
 protected $collection;
 private bool $shouldBlinkEntryUris = true;

 protected function collection()
 {
Expand DownExpand Up@@ -95,6 +98,10 @@ public function makeItemFromFile($path, $contents)
 $entry->date((new GetDateFromPath)($path));
 }

 // Blink the entry so that it can be used when building the URI. If it's not
 // in there, it would try to retrieve the entry, which doesn't exist yet.
 Blink::store('structure-entries')->put($id, $entry);

 if (isset($idGenerated) || isset($positionGenerated)) {
 $this->writeItemToDiskWithoutIncrementing($entry);
 }
Expand DownExpand Up@@ -217,4 +224,37 @@ protected function writeItemToDisk($item)

 $item->writeFile($path);
 }

 protected function cacheItem($item)
 {
 $key = $this->getItemKey($item);

 $cacheKey = $this->getItemCacheKey($key);

 Cache::forever($cacheKey, ['entry' => $item, 'uri' => $item->uri()]);
 }

 protected function getCachedItem($key)
 {
 $cacheKey = $this->getItemCacheKey($key);

 if (! $cache = Cache::get($cacheKey)) {
 return null;
 }

 if ($this->shouldBlinkEntryUris && $cache['uri']) {
 Blink::store('entry-uris')->put($cache['entry']->id(), $cache['uri']);
 }

 return $cache['entry'];
 }

 public function withoutBlinkingEntryUris($callback)
 {
 $this->shouldBlinkEntryUris = false;
 $return = $callback();
 $this->shouldBlinkEntryUris = true;

 return $return;
 }
}

17 changes: 13 additions & 4 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,20 @@ protected function getDefaultPublishState($data)

 public function updateEntryUris($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('uri');
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 $this->updateEntriesWithinIndex($index, $ids);
 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
Expand Down

4 changes: 2 additions & 2 deletions
tests/Antlers/Runtime/PartialsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function test_sections_work_inside_the_main_slot_content()
 {
 Collection::make('pages')->routes('{slug}')->save();

 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('/')->create();
 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('test')->create();

 $layout = <<<'LAYOUT'
{{ yield:test }}
Expand All@@ -59,7 +59,7 @@ public function test_sections_work_inside_the_main_slot_content()
 $this->viewShouldReturnRaw('default', $default);
 $this->viewShouldReturnRaw('test', $partial);

 $response = $this->get('/')->assertOk();
 $response = $this->get('test')->assertOk();
 $content = trim(StringUtilities::normalizeLineEndings($response->content()));

 $expected = <<<'EXPECTED'
Expand Down

20 changes: 10 additions & 10 deletions
tests/Antlers/Runtime/RuntimeValuesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,6 @@ public function test_supplemented_values_are_not_cached()
 {
 $this->withFakeViews();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $instance = (new class extends Tags
 {
 public static $handle = 'dont_cache';
Expand All@@ -49,6 +39,16 @@ public function mePlease()

 $instance::register();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $this->viewShouldReturnRaw('default', $template);
 $this->viewShouldReturnRaw('layout', '{{ template_content }}');

Expand Down

7 changes: 4 additions & 3 deletions
tests/Antlers/Runtime/TagCheckScopeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,9 +132,6 @@ public function test_node_processor_does_not_trash_scope_when_checking_if_someth

 public function test_condition_augmentation_doesnt_reset_up_the_scope()
 {
 $this->createData();
 $this->withFakeViews();

 (new class extends Tags
 {
 public static $handle = 'just_a_tag';
Expand All@@ -144,6 +141,10 @@ public function index()
 return [];
 }
 })::register();

 $this->createData();
 $this->withFakeViews();

 $template = <<<'EOT'

{{ just_a_tag }}
Expand Down

11 changes: 6 additions & 5 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -637,8 +637,6 @@ public function a_localized_entry_in_a_structured_collection_without_a_route_for
 */
 public function it_gets_urls_for_first_child_redirects($value)
 {
 \Event::fake(); // Don't invalidate static cache etc when saving entries.

 $this->setSites([
 'en' => ['url' => 'http://domain.com/', 'locale' => 'en_US'],
 ]);
Expand DownExpand Up@@ -1356,7 +1354,7 @@ public function when_saving_quietly_the_cached_entrys_withEvents_flag_will_be_se

 $entry->saveQuietly();

 $cached = Cache::get('stache::items::entries::blog::1');
 $cached = Cache::get('stache::items::entries::blog::1')['entry'];
 $reflection = new ReflectionClass($cached);
 $property = $reflection->getProperty('withEvents');
 $property->setAccessible(true);
Expand All@@ -1375,8 +1373,11 @@ public function it_clears_blink_caches_when_saving()
 $mock->shouldReceive('store')->with('structure-uris')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 );
 $mock->shouldReceive('store')->with('structure-entries')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 $mock->shouldReceive('store')->with('structure-entries')->twice()->andReturn(
 tap($this->mock(\Spatie\Blink\Blink::class), function ($m) {
 $m->shouldReceive('forget')->with('a')->once();
 $m->shouldReceive('put')->once();
 })
 );

 $entry->save();
Expand Down

2 changes: 1 addition & 1 deletion
tests/Data/Structures/TreeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ public function it_gets_the_parent()
 $parent = $tree->parent();

 $this->assertInstanceOf(Page::class, $parent);
 $this->assertEquals(Entry::find('pages-home'), $parent->entry());
 $this->assertEquals(Entry::find('pages-home')->id(), $parent->entry()->id());
 }

 /** @test */
Expand Down

12 changes: 6 additions & 6 deletions
tests/Feature/Entries/MountingTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ public function updating_a_mounted_page_will_update_the_uris_for_each_entry_in_t
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 $mount->slug('diary')->save();

 $this->assertNull(Entry::findByUri('/pages/blog/one'));
 $this->assertNull(Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one, Entry::findByUri('/pages/diary/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/diary/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/diary/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/diary/two')->id());
 }

 /** @test */
Expand All@@ -54,8 +54,8 @@ public function updating_a_mounted_page_will_not_update_the_uris_when_slug_is_cl
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 // Since we're just saving the mount without changing the slug, we don't want to update the URIs.
 $mock = \Mockery::mock(Collection::getFacadeRoot())->makePartial();
Expand Down

6 changes: 3 additions & 3 deletions
tests/Stache/Stores/EntriesStoreTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ public function it_makes_entry_instances_from_files()
 public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -122,7 +122,7 @@ public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id_then_slug_is_null()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -138,7 +138,7 @@ public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id
 public function if_slugs_are_required_and_the_filename_is_the_same_as_the_id_then_slug_is_the_id()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(true)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(true)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[5.x] Cache entry uri#9844

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 18 commits into

from

Apr 29, 2024
 Merged


[5.x] Cache entry uri
#9844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
0cfc2e1

allow caching of uri to property, and set it up front so it gets cached.


jasonvarga Apr 8, 2024
74f01a2

Merge branch 'master' into entry-uri


jasonvarga Apr 10, 2024
e1aef40

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
95be09a

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
f9cffe0

Merge branch 'master' into entry-uri


jasonvarga Apr 23, 2024
e0d2e86

use blink and reset appropriately


jasonvarga Apr 23, 2024
add8255

mock


jasonvarga Apr 23, 2024
88d1159

compare ids since the objects arent technically identical (computedCa…


jasonvarga Apr 23, 2024
7ae2be0

set the handles otherwise you get an error when it tries to do a look…


jasonvarga Apr 23, 2024
1deddc3

cache the uri along with the entry.


jasonvarga Apr 24, 2024
fdc19f0

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
bba4d75

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
6ba8099

Fix test by moving the tag before content creation ...


jasonvarga Apr 29, 2024
0664168

ditto


jasonvarga Apr 29, 2024
972ee90

the cached item is now an array and the entry is one of the values.


jasonvarga Apr 29, 2024
1a76cff

Fix this test ...


jasonvarga Apr 29, 2024
f740018

compare ids. the objects might be have different properties - like th…


jasonvarga Apr 29, 2024
0f90874

when entries are saved, update them in the stache


jasonvarga Apr 29, 2024

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


20 changes: 17 additions & 3 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,7 @@ public function save()
 Facades\Entry::save($this);

 if ($this->id()) {
 Blink::store('entry-uris')->forget($this->id());
 Blink::store('structure-uris')->forget($this->id());
 Blink::store('structure-entries')->forget($this->id());
 Blink::forget($this->getOriginBlinkKey());
Expand DownExpand Up@@ -876,15 +877,23 @@ public function routeData()

 public function uri()
 {
 if ($this->id() && Blink::store('entry-uris')->has($this->id())) {
 return Blink::store('entry-uris')->get($this->id());
 }

 if (! $this->route()) {
 return null;
 }

 if ($structure = $this->structure()) {
 return $structure->entryUri($this);
 $uri = ($structure = $this->structure())
 ? $structure->entryUri($this)
 : $this->routableUri();

 if ($uri && $this->id()) {
 Blink::store('entry-uris')->put($this->id(), $uri);
 }

 return $this->routableUri();
 return $uri;
 }

 public function fileExtension()
Expand DownExpand Up@@ -1011,6 +1020,11 @@ public function getQueryableValue(string $field)
 return $this->value('authors');
 }

 // Reset the cached uri so it gets recalculated.
 if ($field === 'uri') {
 Blink::store('entry-uris')->forget($this->id());
 }

 if (method_exists($this, $method = Str::camel($field))) {
 return $this->{$method}();
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Entries\EntryCollection;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Exceptions\EntryNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Rules\Slug;
use Statamic\Stache\Query\EntryQueryBuilder;
Expand DownExpand Up@@ -151,6 +152,7 @@ public static function bindings(): array

 public function substitute($item)
 {
 Blink::store('entry-uris')->forget($item->id());
 $this->substitutionsById[$item->id()] = $item;
 $this->substitutionsByUri[$item->locale().'@'.$item->uri()] = $item;
 }
Expand Down

40 changes: 40 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,12 @@

namespace Statamic\Stache\Stores;

use Illuminate\Support\Facades\Cache;
use Statamic\Entries\GetDateFromPath;
use Statamic\Entries\GetSlugFromPath;
use Statamic\Entries\GetSuffixFromPath;
use Statamic\Entries\RemoveSuffixFromPath;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\File;
Expand All@@ -20,6 +22,7 @@
class CollectionEntriesStore extends ChildStore
{
 protected $collection;
 private bool $shouldBlinkEntryUris = true;

 protected function collection()
 {
Expand DownExpand Up@@ -95,6 +98,10 @@ public function makeItemFromFile($path, $contents)
 $entry->date((new GetDateFromPath)($path));
 }

 // Blink the entry so that it can be used when building the URI. If it's not
 // in there, it would try to retrieve the entry, which doesn't exist yet.
 Blink::store('structure-entries')->put($id, $entry);

 if (isset($idGenerated) || isset($positionGenerated)) {
 $this->writeItemToDiskWithoutIncrementing($entry);
 }
Expand DownExpand Up@@ -217,4 +224,37 @@ protected function writeItemToDisk($item)

 $item->writeFile($path);
 }

 protected function cacheItem($item)
 {
 $key = $this->getItemKey($item);

 $cacheKey = $this->getItemCacheKey($key);

 Cache::forever($cacheKey, ['entry' => $item, 'uri' => $item->uri()]);
 }

 protected function getCachedItem($key)
 {
 $cacheKey = $this->getItemCacheKey($key);

 if (! $cache = Cache::get($cacheKey)) {
 return null;
 }

 if ($this->shouldBlinkEntryUris && $cache['uri']) {
 Blink::store('entry-uris')->put($cache['entry']->id(), $cache['uri']);
 }

 return $cache['entry'];
 }

 public function withoutBlinkingEntryUris($callback)
 {
 $this->shouldBlinkEntryUris = false;
 $return = $callback();
 $this->shouldBlinkEntryUris = true;

 return $return;
 }
}

17 changes: 13 additions & 4 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,20 @@ protected function getDefaultPublishState($data)

 public function updateEntryUris($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('uri');
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 $this->updateEntriesWithinIndex($index, $ids);
 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
Expand Down

4 changes: 2 additions & 2 deletions
tests/Antlers/Runtime/PartialsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function test_sections_work_inside_the_main_slot_content()
 {
 Collection::make('pages')->routes('{slug}')->save();

 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('/')->create();
 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('test')->create();

 $layout = <<<'LAYOUT'
{{ yield:test }}
Expand All@@ -59,7 +59,7 @@ public function test_sections_work_inside_the_main_slot_content()
 $this->viewShouldReturnRaw('default', $default);
 $this->viewShouldReturnRaw('test', $partial);

 $response = $this->get('/')->assertOk();
 $response = $this->get('test')->assertOk();
 $content = trim(StringUtilities::normalizeLineEndings($response->content()));

 $expected = <<<'EXPECTED'
Expand Down

20 changes: 10 additions & 10 deletions
tests/Antlers/Runtime/RuntimeValuesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,6 @@ public function test_supplemented_values_are_not_cached()
 {
 $this->withFakeViews();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $instance = (new class extends Tags
 {
 public static $handle = 'dont_cache';
Expand All@@ -49,6 +39,16 @@ public function mePlease()

 $instance::register();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $this->viewShouldReturnRaw('default', $template);
 $this->viewShouldReturnRaw('layout', '{{ template_content }}');

Expand Down

7 changes: 4 additions & 3 deletions
tests/Antlers/Runtime/TagCheckScopeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,9 +132,6 @@ public function test_node_processor_does_not_trash_scope_when_checking_if_someth

 public function test_condition_augmentation_doesnt_reset_up_the_scope()
 {
 $this->createData();
 $this->withFakeViews();

 (new class extends Tags
 {
 public static $handle = 'just_a_tag';
Expand All@@ -144,6 +141,10 @@ public function index()
 return [];
 }
 })::register();

 $this->createData();
 $this->withFakeViews();

 $template = <<<'EOT'

{{ just_a_tag }}
Expand Down

11 changes: 6 additions & 5 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -637,8 +637,6 @@ public function a_localized_entry_in_a_structured_collection_without_a_route_for
 */
 public function it_gets_urls_for_first_child_redirects($value)
 {
 \Event::fake(); // Don't invalidate static cache etc when saving entries.

 $this->setSites([
 'en' => ['url' => 'http://domain.com/', 'locale' => 'en_US'],
 ]);
Expand DownExpand Up@@ -1356,7 +1354,7 @@ public function when_saving_quietly_the_cached_entrys_withEvents_flag_will_be_se

 $entry->saveQuietly();

 $cached = Cache::get('stache::items::entries::blog::1');
 $cached = Cache::get('stache::items::entries::blog::1')['entry'];
 $reflection = new ReflectionClass($cached);
 $property = $reflection->getProperty('withEvents');
 $property->setAccessible(true);
Expand All@@ -1375,8 +1373,11 @@ public function it_clears_blink_caches_when_saving()
 $mock->shouldReceive('store')->with('structure-uris')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 );
 $mock->shouldReceive('store')->with('structure-entries')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 $mock->shouldReceive('store')->with('structure-entries')->twice()->andReturn(
 tap($this->mock(\Spatie\Blink\Blink::class), function ($m) {
 $m->shouldReceive('forget')->with('a')->once();
 $m->shouldReceive('put')->once();
 })
 );

 $entry->save();
Expand Down

2 changes: 1 addition & 1 deletion
tests/Data/Structures/TreeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ public function it_gets_the_parent()
 $parent = $tree->parent();

 $this->assertInstanceOf(Page::class, $parent);
 $this->assertEquals(Entry::find('pages-home'), $parent->entry());
 $this->assertEquals(Entry::find('pages-home')->id(), $parent->entry()->id());
 }

 /** @test */
Expand Down

12 changes: 6 additions & 6 deletions
tests/Feature/Entries/MountingTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ public function updating_a_mounted_page_will_update_the_uris_for_each_entry_in_t
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 $mount->slug('diary')->save();

 $this->assertNull(Entry::findByUri('/pages/blog/one'));
 $this->assertNull(Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one, Entry::findByUri('/pages/diary/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/diary/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/diary/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/diary/two')->id());
 }

 /** @test */
Expand All@@ -54,8 +54,8 @@ public function updating_a_mounted_page_will_not_update_the_uris_when_slug_is_cl
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 // Since we're just saving the mount without changing the slug, we don't want to update the URIs.
 $mock = \Mockery::mock(Collection::getFacadeRoot())->makePartial();
Expand Down

6 changes: 3 additions & 3 deletions
tests/Stache/Stores/EntriesStoreTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ public function it_makes_entry_instances_from_files()
 public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -122,7 +122,7 @@ public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id_then_slug_is_null()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -138,7 +138,7 @@ public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id
 public function if_slugs_are_required_and_the_filename_is_the_same_as_the_id_then_slug_is_the_id()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(true)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(true)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[5.x] Cache entry uri#9844

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 18 commits into

from

Apr 29, 2024
 Merged


[5.x] Cache entry uri
#9844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
0cfc2e1

allow caching of uri to property, and set it up front so it gets cached.


jasonvarga Apr 8, 2024
74f01a2

Merge branch 'master' into entry-uri


jasonvarga Apr 10, 2024
e1aef40

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
95be09a

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
f9cffe0

Merge branch 'master' into entry-uri


jasonvarga Apr 23, 2024
e0d2e86

use blink and reset appropriately


jasonvarga Apr 23, 2024
add8255

mock


jasonvarga Apr 23, 2024
88d1159

compare ids since the objects arent technically identical (computedCa…


jasonvarga Apr 23, 2024
7ae2be0

set the handles otherwise you get an error when it tries to do a look…


jasonvarga Apr 23, 2024
1deddc3

cache the uri along with the entry.


jasonvarga Apr 24, 2024
fdc19f0

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
bba4d75

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
6ba8099

Fix test by moving the tag before content creation ...


jasonvarga Apr 29, 2024
0664168

ditto


jasonvarga Apr 29, 2024
972ee90

the cached item is now an array and the entry is one of the values.


jasonvarga Apr 29, 2024
1a76cff

Fix this test ...


jasonvarga Apr 29, 2024
f740018

compare ids. the objects might be have different properties - like th…


jasonvarga Apr 29, 2024
0f90874

when entries are saved, update them in the stache


jasonvarga Apr 29, 2024

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


20 changes: 17 additions & 3 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,7 @@ public function save()
 Facades\Entry::save($this);

 if ($this->id()) {
 Blink::store('entry-uris')->forget($this->id());
 Blink::store('structure-uris')->forget($this->id());
 Blink::store('structure-entries')->forget($this->id());
 Blink::forget($this->getOriginBlinkKey());
Expand DownExpand Up@@ -876,15 +877,23 @@ public function routeData()

 public function uri()
 {
 if ($this->id() && Blink::store('entry-uris')->has($this->id())) {
 return Blink::store('entry-uris')->get($this->id());
 }

 if (! $this->route()) {
 return null;
 }

 if ($structure = $this->structure()) {
 return $structure->entryUri($this);
 $uri = ($structure = $this->structure())
 ? $structure->entryUri($this)
 : $this->routableUri();

 if ($uri && $this->id()) {
 Blink::store('entry-uris')->put($this->id(), $uri);
 }

 return $this->routableUri();
 return $uri;
 }

 public function fileExtension()
Expand DownExpand Up@@ -1011,6 +1020,11 @@ public function getQueryableValue(string $field)
 return $this->value('authors');
 }

 // Reset the cached uri so it gets recalculated.
 if ($field === 'uri') {
 Blink::store('entry-uris')->forget($this->id());
 }

 if (method_exists($this, $method = Str::camel($field))) {
 return $this->{$method}();
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Entries\EntryCollection;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Exceptions\EntryNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Rules\Slug;
use Statamic\Stache\Query\EntryQueryBuilder;
Expand DownExpand Up@@ -151,6 +152,7 @@ public static function bindings(): array

 public function substitute($item)
 {
 Blink::store('entry-uris')->forget($item->id());
 $this->substitutionsById[$item->id()] = $item;
 $this->substitutionsByUri[$item->locale().'@'.$item->uri()] = $item;
 }
Expand Down

40 changes: 40 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,12 @@

namespace Statamic\Stache\Stores;

use Illuminate\Support\Facades\Cache;
use Statamic\Entries\GetDateFromPath;
use Statamic\Entries\GetSlugFromPath;
use Statamic\Entries\GetSuffixFromPath;
use Statamic\Entries\RemoveSuffixFromPath;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\File;
Expand All@@ -20,6 +22,7 @@
class CollectionEntriesStore extends ChildStore
{
 protected $collection;
 private bool $shouldBlinkEntryUris = true;

 protected function collection()
 {
Expand DownExpand Up@@ -95,6 +98,10 @@ public function makeItemFromFile($path, $contents)
 $entry->date((new GetDateFromPath)($path));
 }

 // Blink the entry so that it can be used when building the URI. If it's not
 // in there, it would try to retrieve the entry, which doesn't exist yet.
 Blink::store('structure-entries')->put($id, $entry);

 if (isset($idGenerated) || isset($positionGenerated)) {
 $this->writeItemToDiskWithoutIncrementing($entry);
 }
Expand DownExpand Up@@ -217,4 +224,37 @@ protected function writeItemToDisk($item)

 $item->writeFile($path);
 }

 protected function cacheItem($item)
 {
 $key = $this->getItemKey($item);

 $cacheKey = $this->getItemCacheKey($key);

 Cache::forever($cacheKey, ['entry' => $item, 'uri' => $item->uri()]);
 }

 protected function getCachedItem($key)
 {
 $cacheKey = $this->getItemCacheKey($key);

 if (! $cache = Cache::get($cacheKey)) {
 return null;
 }

 if ($this->shouldBlinkEntryUris && $cache['uri']) {
 Blink::store('entry-uris')->put($cache['entry']->id(), $cache['uri']);
 }

 return $cache['entry'];
 }

 public function withoutBlinkingEntryUris($callback)
 {
 $this->shouldBlinkEntryUris = false;
 $return = $callback();
 $this->shouldBlinkEntryUris = true;

 return $return;
 }
}

17 changes: 13 additions & 4 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,20 @@ protected function getDefaultPublishState($data)

 public function updateEntryUris($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('uri');
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 $this->updateEntriesWithinIndex($index, $ids);
 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
Expand Down

4 changes: 2 additions & 2 deletions
tests/Antlers/Runtime/PartialsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function test_sections_work_inside_the_main_slot_content()
 {
 Collection::make('pages')->routes('{slug}')->save();

 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('/')->create();
 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('test')->create();

 $layout = <<<'LAYOUT'
{{ yield:test }}
Expand All@@ -59,7 +59,7 @@ public function test_sections_work_inside_the_main_slot_content()
 $this->viewShouldReturnRaw('default', $default);
 $this->viewShouldReturnRaw('test', $partial);

 $response = $this->get('/')->assertOk();
 $response = $this->get('test')->assertOk();
 $content = trim(StringUtilities::normalizeLineEndings($response->content()));

 $expected = <<<'EXPECTED'
Expand Down

20 changes: 10 additions & 10 deletions
tests/Antlers/Runtime/RuntimeValuesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,6 @@ public function test_supplemented_values_are_not_cached()
 {
 $this->withFakeViews();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $instance = (new class extends Tags
 {
 public static $handle = 'dont_cache';
Expand All@@ -49,6 +39,16 @@ public function mePlease()

 $instance::register();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $this->viewShouldReturnRaw('default', $template);
 $this->viewShouldReturnRaw('layout', '{{ template_content }}');

Expand Down

7 changes: 4 additions & 3 deletions
tests/Antlers/Runtime/TagCheckScopeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,9 +132,6 @@ public function test_node_processor_does_not_trash_scope_when_checking_if_someth

 public function test_condition_augmentation_doesnt_reset_up_the_scope()
 {
 $this->createData();
 $this->withFakeViews();

 (new class extends Tags
 {
 public static $handle = 'just_a_tag';
Expand All@@ -144,6 +141,10 @@ public function index()
 return [];
 }
 })::register();

 $this->createData();
 $this->withFakeViews();

 $template = <<<'EOT'

{{ just_a_tag }}
Expand Down

11 changes: 6 additions & 5 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -637,8 +637,6 @@ public function a_localized_entry_in_a_structured_collection_without_a_route_for
 */
 public function it_gets_urls_for_first_child_redirects($value)
 {
 \Event::fake(); // Don't invalidate static cache etc when saving entries.

 $this->setSites([
 'en' => ['url' => 'http://domain.com/', 'locale' => 'en_US'],
 ]);
Expand DownExpand Up@@ -1356,7 +1354,7 @@ public function when_saving_quietly_the_cached_entrys_withEvents_flag_will_be_se

 $entry->saveQuietly();

 $cached = Cache::get('stache::items::entries::blog::1');
 $cached = Cache::get('stache::items::entries::blog::1')['entry'];
 $reflection = new ReflectionClass($cached);
 $property = $reflection->getProperty('withEvents');
 $property->setAccessible(true);
Expand All@@ -1375,8 +1373,11 @@ public function it_clears_blink_caches_when_saving()
 $mock->shouldReceive('store')->with('structure-uris')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 );
 $mock->shouldReceive('store')->with('structure-entries')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 $mock->shouldReceive('store')->with('structure-entries')->twice()->andReturn(
 tap($this->mock(\Spatie\Blink\Blink::class), function ($m) {
 $m->shouldReceive('forget')->with('a')->once();
 $m->shouldReceive('put')->once();
 })
 );

 $entry->save();
Expand Down

2 changes: 1 addition & 1 deletion
tests/Data/Structures/TreeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ public function it_gets_the_parent()
 $parent = $tree->parent();

 $this->assertInstanceOf(Page::class, $parent);
 $this->assertEquals(Entry::find('pages-home'), $parent->entry());
 $this->assertEquals(Entry::find('pages-home')->id(), $parent->entry()->id());
 }

 /** @test */
Expand Down

12 changes: 6 additions & 6 deletions
tests/Feature/Entries/MountingTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ public function updating_a_mounted_page_will_update_the_uris_for_each_entry_in_t
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 $mount->slug('diary')->save();

 $this->assertNull(Entry::findByUri('/pages/blog/one'));
 $this->assertNull(Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one, Entry::findByUri('/pages/diary/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/diary/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/diary/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/diary/two')->id());
 }

 /** @test */
Expand All@@ -54,8 +54,8 @@ public function updating_a_mounted_page_will_not_update_the_uris_when_slug_is_cl
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 // Since we're just saving the mount without changing the slug, we don't want to update the URIs.
 $mock = \Mockery::mock(Collection::getFacadeRoot())->makePartial();
Expand Down

6 changes: 3 additions & 3 deletions
tests/Stache/Stores/EntriesStoreTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ public function it_makes_entry_instances_from_files()
 public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -122,7 +122,7 @@ public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id_then_slug_is_null()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -138,7 +138,7 @@ public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id
 public function if_slugs_are_required_and_the_filename_is_the_same_as_the_id_then_slug_is_the_id()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(true)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(true)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[5.x] Cache entry uri#9844

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 18 commits into

from

Apr 29, 2024
 Merged


[5.x] Cache entry uri
#9844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
0cfc2e1

allow caching of uri to property, and set it up front so it gets cached.


jasonvarga Apr 8, 2024
74f01a2

Merge branch 'master' into entry-uri


jasonvarga Apr 10, 2024
e1aef40

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
95be09a

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
f9cffe0

Merge branch 'master' into entry-uri


jasonvarga Apr 23, 2024
e0d2e86

use blink and reset appropriately


jasonvarga Apr 23, 2024
add8255

mock


jasonvarga Apr 23, 2024
88d1159

compare ids since the objects arent technically identical (computedCa…


jasonvarga Apr 23, 2024
7ae2be0

set the handles otherwise you get an error when it tries to do a look…


jasonvarga Apr 23, 2024
1deddc3

cache the uri along with the entry.


jasonvarga Apr 24, 2024
fdc19f0

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
bba4d75

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
6ba8099

Fix test by moving the tag before content creation ...


jasonvarga Apr 29, 2024
0664168

ditto


jasonvarga Apr 29, 2024
972ee90

the cached item is now an array and the entry is one of the values.


jasonvarga Apr 29, 2024
1a76cff

Fix this test ...


jasonvarga Apr 29, 2024
f740018

compare ids. the objects might be have different properties - like th…


jasonvarga Apr 29, 2024
0f90874

when entries are saved, update them in the stache


jasonvarga Apr 29, 2024

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


20 changes: 17 additions & 3 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,7 @@ public function save()
 Facades\Entry::save($this);

 if ($this->id()) {
 Blink::store('entry-uris')->forget($this->id());
 Blink::store('structure-uris')->forget($this->id());
 Blink::store('structure-entries')->forget($this->id());
 Blink::forget($this->getOriginBlinkKey());
Expand DownExpand Up@@ -876,15 +877,23 @@ public function routeData()

 public function uri()
 {
 if ($this->id() && Blink::store('entry-uris')->has($this->id())) {
 return Blink::store('entry-uris')->get($this->id());
 }

 if (! $this->route()) {
 return null;
 }

 if ($structure = $this->structure()) {
 return $structure->entryUri($this);
 $uri = ($structure = $this->structure())
 ? $structure->entryUri($this)
 : $this->routableUri();

 if ($uri && $this->id()) {
 Blink::store('entry-uris')->put($this->id(), $uri);
 }

 return $this->routableUri();
 return $uri;
 }

 public function fileExtension()
Expand DownExpand Up@@ -1011,6 +1020,11 @@ public function getQueryableValue(string $field)
 return $this->value('authors');
 }

 // Reset the cached uri so it gets recalculated.
 if ($field === 'uri') {
 Blink::store('entry-uris')->forget($this->id());
 }

 if (method_exists($this, $method = Str::camel($field))) {
 return $this->{$method}();
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Entries\EntryCollection;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Exceptions\EntryNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Rules\Slug;
use Statamic\Stache\Query\EntryQueryBuilder;
Expand DownExpand Up@@ -151,6 +152,7 @@ public static function bindings(): array

 public function substitute($item)
 {
 Blink::store('entry-uris')->forget($item->id());
 $this->substitutionsById[$item->id()] = $item;
 $this->substitutionsByUri[$item->locale().'@'.$item->uri()] = $item;
 }
Expand Down

40 changes: 40 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,12 @@

namespace Statamic\Stache\Stores;

use Illuminate\Support\Facades\Cache;
use Statamic\Entries\GetDateFromPath;
use Statamic\Entries\GetSlugFromPath;
use Statamic\Entries\GetSuffixFromPath;
use Statamic\Entries\RemoveSuffixFromPath;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\File;
Expand All@@ -20,6 +22,7 @@
class CollectionEntriesStore extends ChildStore
{
 protected $collection;
 private bool $shouldBlinkEntryUris = true;

 protected function collection()
 {
Expand DownExpand Up@@ -95,6 +98,10 @@ public function makeItemFromFile($path, $contents)
 $entry->date((new GetDateFromPath)($path));
 }

 // Blink the entry so that it can be used when building the URI. If it's not
 // in there, it would try to retrieve the entry, which doesn't exist yet.
 Blink::store('structure-entries')->put($id, $entry);

 if (isset($idGenerated) || isset($positionGenerated)) {
 $this->writeItemToDiskWithoutIncrementing($entry);
 }
Expand DownExpand Up@@ -217,4 +224,37 @@ protected function writeItemToDisk($item)

 $item->writeFile($path);
 }

 protected function cacheItem($item)
 {
 $key = $this->getItemKey($item);

 $cacheKey = $this->getItemCacheKey($key);

 Cache::forever($cacheKey, ['entry' => $item, 'uri' => $item->uri()]);
 }

 protected function getCachedItem($key)
 {
 $cacheKey = $this->getItemCacheKey($key);

 if (! $cache = Cache::get($cacheKey)) {
 return null;
 }

 if ($this->shouldBlinkEntryUris && $cache['uri']) {
 Blink::store('entry-uris')->put($cache['entry']->id(), $cache['uri']);
 }

 return $cache['entry'];
 }

 public function withoutBlinkingEntryUris($callback)
 {
 $this->shouldBlinkEntryUris = false;
 $return = $callback();
 $this->shouldBlinkEntryUris = true;

 return $return;
 }
}

17 changes: 13 additions & 4 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,20 @@ protected function getDefaultPublishState($data)

 public function updateEntryUris($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('uri');
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 $this->updateEntriesWithinIndex($index, $ids);
 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
Expand Down

4 changes: 2 additions & 2 deletions
tests/Antlers/Runtime/PartialsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function test_sections_work_inside_the_main_slot_content()
 {
 Collection::make('pages')->routes('{slug}')->save();

 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('/')->create();
 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('test')->create();

 $layout = <<<'LAYOUT'
{{ yield:test }}
Expand All@@ -59,7 +59,7 @@ public function test_sections_work_inside_the_main_slot_content()
 $this->viewShouldReturnRaw('default', $default);
 $this->viewShouldReturnRaw('test', $partial);

 $response = $this->get('/')->assertOk();
 $response = $this->get('test')->assertOk();
 $content = trim(StringUtilities::normalizeLineEndings($response->content()));

 $expected = <<<'EXPECTED'
Expand Down

20 changes: 10 additions & 10 deletions
tests/Antlers/Runtime/RuntimeValuesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,6 @@ public function test_supplemented_values_are_not_cached()
 {
 $this->withFakeViews();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $instance = (new class extends Tags
 {
 public static $handle = 'dont_cache';
Expand All@@ -49,6 +39,16 @@ public function mePlease()

 $instance::register();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $this->viewShouldReturnRaw('default', $template);
 $this->viewShouldReturnRaw('layout', '{{ template_content }}');

Expand Down

7 changes: 4 additions & 3 deletions
tests/Antlers/Runtime/TagCheckScopeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,9 +132,6 @@ public function test_node_processor_does_not_trash_scope_when_checking_if_someth

 public function test_condition_augmentation_doesnt_reset_up_the_scope()
 {
 $this->createData();
 $this->withFakeViews();

 (new class extends Tags
 {
 public static $handle = 'just_a_tag';
Expand All@@ -144,6 +141,10 @@ public function index()
 return [];
 }
 })::register();

 $this->createData();
 $this->withFakeViews();

 $template = <<<'EOT'

{{ just_a_tag }}
Expand Down

11 changes: 6 additions & 5 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -637,8 +637,6 @@ public function a_localized_entry_in_a_structured_collection_without_a_route_for
 */
 public function it_gets_urls_for_first_child_redirects($value)
 {
 \Event::fake(); // Don't invalidate static cache etc when saving entries.

 $this->setSites([
 'en' => ['url' => 'http://domain.com/', 'locale' => 'en_US'],
 ]);
Expand DownExpand Up@@ -1356,7 +1354,7 @@ public function when_saving_quietly_the_cached_entrys_withEvents_flag_will_be_se

 $entry->saveQuietly();

 $cached = Cache::get('stache::items::entries::blog::1');
 $cached = Cache::get('stache::items::entries::blog::1')['entry'];
 $reflection = new ReflectionClass($cached);
 $property = $reflection->getProperty('withEvents');
 $property->setAccessible(true);
Expand All@@ -1375,8 +1373,11 @@ public function it_clears_blink_caches_when_saving()
 $mock->shouldReceive('store')->with('structure-uris')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 );
 $mock->shouldReceive('store')->with('structure-entries')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 $mock->shouldReceive('store')->with('structure-entries')->twice()->andReturn(
 tap($this->mock(\Spatie\Blink\Blink::class), function ($m) {
 $m->shouldReceive('forget')->with('a')->once();
 $m->shouldReceive('put')->once();
 })
 );

 $entry->save();
Expand Down

2 changes: 1 addition & 1 deletion
tests/Data/Structures/TreeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ public function it_gets_the_parent()
 $parent = $tree->parent();

 $this->assertInstanceOf(Page::class, $parent);
 $this->assertEquals(Entry::find('pages-home'), $parent->entry());
 $this->assertEquals(Entry::find('pages-home')->id(), $parent->entry()->id());
 }

 /** @test */
Expand Down

12 changes: 6 additions & 6 deletions
tests/Feature/Entries/MountingTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ public function updating_a_mounted_page_will_update_the_uris_for_each_entry_in_t
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 $mount->slug('diary')->save();

 $this->assertNull(Entry::findByUri('/pages/blog/one'));
 $this->assertNull(Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one, Entry::findByUri('/pages/diary/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/diary/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/diary/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/diary/two')->id());
 }

 /** @test */
Expand All@@ -54,8 +54,8 @@ public function updating_a_mounted_page_will_not_update_the_uris_when_slug_is_cl
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 // Since we're just saving the mount without changing the slug, we don't want to update the URIs.
 $mock = \Mockery::mock(Collection::getFacadeRoot())->makePartial();
Expand Down

6 changes: 3 additions & 3 deletions
tests/Stache/Stores/EntriesStoreTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ public function it_makes_entry_instances_from_files()
 public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -122,7 +122,7 @@ public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id_then_slug_is_null()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -138,7 +138,7 @@ public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id
 public function if_slugs_are_required_and_the_filename_is_the_same_as_the_id_then_slug_is_the_id()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(true)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(true)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[5.x] Cache entry uri#9844

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 18 commits into

from

Apr 29, 2024
 Merged


[5.x] Cache entry uri
#9844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
0cfc2e1

allow caching of uri to property, and set it up front so it gets cached.


jasonvarga Apr 8, 2024
74f01a2

Merge branch 'master' into entry-uri


jasonvarga Apr 10, 2024
e1aef40

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
95be09a

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
f9cffe0

Merge branch 'master' into entry-uri


jasonvarga Apr 23, 2024
e0d2e86

use blink and reset appropriately


jasonvarga Apr 23, 2024
add8255

mock


jasonvarga Apr 23, 2024
88d1159

compare ids since the objects arent technically identical (computedCa…


jasonvarga Apr 23, 2024
7ae2be0

set the handles otherwise you get an error when it tries to do a look…


jasonvarga Apr 23, 2024
1deddc3

cache the uri along with the entry.


jasonvarga Apr 24, 2024
fdc19f0

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
bba4d75

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
6ba8099

Fix test by moving the tag before content creation ...


jasonvarga Apr 29, 2024
0664168

ditto


jasonvarga Apr 29, 2024
972ee90

the cached item is now an array and the entry is one of the values.


jasonvarga Apr 29, 2024
1a76cff

Fix this test ...


jasonvarga Apr 29, 2024
f740018

compare ids. the objects might be have different properties - like th…


jasonvarga Apr 29, 2024
0f90874

when entries are saved, update them in the stache


jasonvarga Apr 29, 2024

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


20 changes: 17 additions & 3 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,7 @@ public function save()
 Facades\Entry::save($this);

 if ($this->id()) {
 Blink::store('entry-uris')->forget($this->id());
 Blink::store('structure-uris')->forget($this->id());
 Blink::store('structure-entries')->forget($this->id());
 Blink::forget($this->getOriginBlinkKey());
Expand DownExpand Up@@ -876,15 +877,23 @@ public function routeData()

 public function uri()
 {
 if ($this->id() && Blink::store('entry-uris')->has($this->id())) {
 return Blink::store('entry-uris')->get($this->id());
 }

 if (! $this->route()) {
 return null;
 }

 if ($structure = $this->structure()) {
 return $structure->entryUri($this);
 $uri = ($structure = $this->structure())
 ? $structure->entryUri($this)
 : $this->routableUri();

 if ($uri && $this->id()) {
 Blink::store('entry-uris')->put($this->id(), $uri);
 }

 return $this->routableUri();
 return $uri;
 }

 public function fileExtension()
Expand DownExpand Up@@ -1011,6 +1020,11 @@ public function getQueryableValue(string $field)
 return $this->value('authors');
 }

 // Reset the cached uri so it gets recalculated.
 if ($field === 'uri') {
 Blink::store('entry-uris')->forget($this->id());
 }

 if (method_exists($this, $method = Str::camel($field))) {
 return $this->{$method}();
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Entries\EntryCollection;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Exceptions\EntryNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Rules\Slug;
use Statamic\Stache\Query\EntryQueryBuilder;
Expand DownExpand Up@@ -151,6 +152,7 @@ public static function bindings(): array

 public function substitute($item)
 {
 Blink::store('entry-uris')->forget($item->id());
 $this->substitutionsById[$item->id()] = $item;
 $this->substitutionsByUri[$item->locale().'@'.$item->uri()] = $item;
 }
Expand Down

40 changes: 40 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,12 @@

namespace Statamic\Stache\Stores;

use Illuminate\Support\Facades\Cache;
use Statamic\Entries\GetDateFromPath;
use Statamic\Entries\GetSlugFromPath;
use Statamic\Entries\GetSuffixFromPath;
use Statamic\Entries\RemoveSuffixFromPath;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\File;
Expand All@@ -20,6 +22,7 @@
class CollectionEntriesStore extends ChildStore
{
 protected $collection;
 private bool $shouldBlinkEntryUris = true;

 protected function collection()
 {
Expand DownExpand Up@@ -95,6 +98,10 @@ public function makeItemFromFile($path, $contents)
 $entry->date((new GetDateFromPath)($path));
 }

 // Blink the entry so that it can be used when building the URI. If it's not
 // in there, it would try to retrieve the entry, which doesn't exist yet.
 Blink::store('structure-entries')->put($id, $entry);

 if (isset($idGenerated) || isset($positionGenerated)) {
 $this->writeItemToDiskWithoutIncrementing($entry);
 }
Expand DownExpand Up@@ -217,4 +224,37 @@ protected function writeItemToDisk($item)

 $item->writeFile($path);
 }

 protected function cacheItem($item)
 {
 $key = $this->getItemKey($item);

 $cacheKey = $this->getItemCacheKey($key);

 Cache::forever($cacheKey, ['entry' => $item, 'uri' => $item->uri()]);
 }

 protected function getCachedItem($key)
 {
 $cacheKey = $this->getItemCacheKey($key);

 if (! $cache = Cache::get($cacheKey)) {
 return null;
 }

 if ($this->shouldBlinkEntryUris && $cache['uri']) {
 Blink::store('entry-uris')->put($cache['entry']->id(), $cache['uri']);
 }

 return $cache['entry'];
 }

 public function withoutBlinkingEntryUris($callback)
 {
 $this->shouldBlinkEntryUris = false;
 $return = $callback();
 $this->shouldBlinkEntryUris = true;

 return $return;
 }
}

17 changes: 13 additions & 4 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,20 @@ protected function getDefaultPublishState($data)

 public function updateEntryUris($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('uri');
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 $this->updateEntriesWithinIndex($index, $ids);
 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
Expand Down

4 changes: 2 additions & 2 deletions
tests/Antlers/Runtime/PartialsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function test_sections_work_inside_the_main_slot_content()
 {
 Collection::make('pages')->routes('{slug}')->save();

 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('/')->create();
 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('test')->create();

 $layout = <<<'LAYOUT'
{{ yield:test }}
Expand All@@ -59,7 +59,7 @@ public function test_sections_work_inside_the_main_slot_content()
 $this->viewShouldReturnRaw('default', $default);
 $this->viewShouldReturnRaw('test', $partial);

 $response = $this->get('/')->assertOk();
 $response = $this->get('test')->assertOk();
 $content = trim(StringUtilities::normalizeLineEndings($response->content()));

 $expected = <<<'EXPECTED'
Expand Down

20 changes: 10 additions & 10 deletions
tests/Antlers/Runtime/RuntimeValuesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,6 @@ public function test_supplemented_values_are_not_cached()
 {
 $this->withFakeViews();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $instance = (new class extends Tags
 {
 public static $handle = 'dont_cache';
Expand All@@ -49,6 +39,16 @@ public function mePlease()

 $instance::register();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $this->viewShouldReturnRaw('default', $template);
 $this->viewShouldReturnRaw('layout', '{{ template_content }}');

Expand Down

7 changes: 4 additions & 3 deletions
tests/Antlers/Runtime/TagCheckScopeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,9 +132,6 @@ public function test_node_processor_does_not_trash_scope_when_checking_if_someth

 public function test_condition_augmentation_doesnt_reset_up_the_scope()
 {
 $this->createData();
 $this->withFakeViews();

 (new class extends Tags
 {
 public static $handle = 'just_a_tag';
Expand All@@ -144,6 +141,10 @@ public function index()
 return [];
 }
 })::register();

 $this->createData();
 $this->withFakeViews();

 $template = <<<'EOT'

{{ just_a_tag }}
Expand Down

11 changes: 6 additions & 5 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -637,8 +637,6 @@ public function a_localized_entry_in_a_structured_collection_without_a_route_for
 */
 public function it_gets_urls_for_first_child_redirects($value)
 {
 \Event::fake(); // Don't invalidate static cache etc when saving entries.

 $this->setSites([
 'en' => ['url' => 'http://domain.com/', 'locale' => 'en_US'],
 ]);
Expand DownExpand Up@@ -1356,7 +1354,7 @@ public function when_saving_quietly_the_cached_entrys_withEvents_flag_will_be_se

 $entry->saveQuietly();

 $cached = Cache::get('stache::items::entries::blog::1');
 $cached = Cache::get('stache::items::entries::blog::1')['entry'];
 $reflection = new ReflectionClass($cached);
 $property = $reflection->getProperty('withEvents');
 $property->setAccessible(true);
Expand All@@ -1375,8 +1373,11 @@ public function it_clears_blink_caches_when_saving()
 $mock->shouldReceive('store')->with('structure-uris')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 );
 $mock->shouldReceive('store')->with('structure-entries')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 $mock->shouldReceive('store')->with('structure-entries')->twice()->andReturn(
 tap($this->mock(\Spatie\Blink\Blink::class), function ($m) {
 $m->shouldReceive('forget')->with('a')->once();
 $m->shouldReceive('put')->once();
 })
 );

 $entry->save();
Expand Down

2 changes: 1 addition & 1 deletion
tests/Data/Structures/TreeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ public function it_gets_the_parent()
 $parent = $tree->parent();

 $this->assertInstanceOf(Page::class, $parent);
 $this->assertEquals(Entry::find('pages-home'), $parent->entry());
 $this->assertEquals(Entry::find('pages-home')->id(), $parent->entry()->id());
 }

 /** @test */
Expand Down

12 changes: 6 additions & 6 deletions
tests/Feature/Entries/MountingTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ public function updating_a_mounted_page_will_update_the_uris_for_each_entry_in_t
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 $mount->slug('diary')->save();

 $this->assertNull(Entry::findByUri('/pages/blog/one'));
 $this->assertNull(Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one, Entry::findByUri('/pages/diary/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/diary/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/diary/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/diary/two')->id());
 }

 /** @test */
Expand All@@ -54,8 +54,8 @@ public function updating_a_mounted_page_will_not_update_the_uris_when_slug_is_cl
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 // Since we're just saving the mount without changing the slug, we don't want to update the URIs.
 $mock = \Mockery::mock(Collection::getFacadeRoot())->makePartial();
Expand Down

6 changes: 3 additions & 3 deletions
tests/Stache/Stores/EntriesStoreTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ public function it_makes_entry_instances_from_files()
 public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -122,7 +122,7 @@ public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id_then_slug_is_null()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -138,7 +138,7 @@ public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id
 public function if_slugs_are_required_and_the_filename_is_the_same_as_the_id_then_slug_is_the_id()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(true)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(true)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[5.x] Cache entry uri#9844

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 18 commits into

from

Apr 29, 2024
 Merged


[5.x] Cache entry uri
#9844
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
0cfc2e1

allow caching of uri to property, and set it up front so it gets cached.


jasonvarga Apr 8, 2024
74f01a2

Merge branch 'master' into entry-uri


jasonvarga Apr 10, 2024
e1aef40

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
95be09a

Merge branch 'master' into entry-uri


jasonvarga Apr 22, 2024
f9cffe0

Merge branch 'master' into entry-uri


jasonvarga Apr 23, 2024
e0d2e86

use blink and reset appropriately


jasonvarga Apr 23, 2024
add8255

mock


jasonvarga Apr 23, 2024
88d1159

compare ids since the objects arent technically identical (computedCa…


jasonvarga Apr 23, 2024
7ae2be0

set the handles otherwise you get an error when it tries to do a look…


jasonvarga Apr 23, 2024
1deddc3

cache the uri along with the entry.


jasonvarga Apr 24, 2024
fdc19f0

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
bba4d75

Merge branch 'master' into entry-uri


jasonvarga Apr 26, 2024
6ba8099

Fix test by moving the tag before content creation ...


jasonvarga Apr 29, 2024
0664168

ditto


jasonvarga Apr 29, 2024
972ee90

the cached item is now an array and the entry is one of the values.


jasonvarga Apr 29, 2024
1a76cff

Fix this test ...


jasonvarga Apr 29, 2024
f740018

compare ids. the objects might be have different properties - like th…


jasonvarga Apr 29, 2024
0f90874

when entries are saved, update them in the stache


jasonvarga Apr 29, 2024

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


20 changes: 17 additions & 3 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,7 @@ public function save()
 Facades\Entry::save($this);

 if ($this->id()) {
 Blink::store('entry-uris')->forget($this->id());
 Blink::store('structure-uris')->forget($this->id());
 Blink::store('structure-entries')->forget($this->id());
 Blink::forget($this->getOriginBlinkKey());
Expand DownExpand Up@@ -876,15 +877,23 @@ public function routeData()

 public function uri()
 {
 if ($this->id() && Blink::store('entry-uris')->has($this->id())) {
 return Blink::store('entry-uris')->get($this->id());
 }

 if (! $this->route()) {
 return null;
 }

 if ($structure = $this->structure()) {
 return $structure->entryUri($this);
 $uri = ($structure = $this->structure())
 ? $structure->entryUri($this)
 : $this->routableUri();

 if ($uri && $this->id()) {
 Blink::store('entry-uris')->put($this->id(), $uri);
 }

 return $this->routableUri();
 return $uri;
 }

 public function fileExtension()
Expand DownExpand Up@@ -1011,6 +1020,11 @@ public function getQueryableValue(string $field)
 return $this->value('authors');
 }

 // Reset the cached uri so it gets recalculated.
 if ($field === 'uri') {
 Blink::store('entry-uris')->forget($this->id());
 }

 if (method_exists($this, $method = Str::camel($field))) {
 return $this->{$method}();
 }
Expand Down

2 changes: 2 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Entries\EntryCollection;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Exceptions\EntryNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Rules\Slug;
use Statamic\Stache\Query\EntryQueryBuilder;
Expand DownExpand Up@@ -151,6 +152,7 @@ public static function bindings(): array

 public function substitute($item)
 {
 Blink::store('entry-uris')->forget($item->id());
 $this->substitutionsById[$item->id()] = $item;
 $this->substitutionsByUri[$item->locale().'@'.$item->uri()] = $item;
 }
Expand Down

40 changes: 40 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,12 @@

namespace Statamic\Stache\Stores;

use Illuminate\Support\Facades\Cache;
use Statamic\Entries\GetDateFromPath;
use Statamic\Entries\GetSlugFromPath;
use Statamic\Entries\GetSuffixFromPath;
use Statamic\Entries\RemoveSuffixFromPath;
use Statamic\Facades\Blink;
use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\File;
Expand All@@ -20,6 +22,7 @@
class CollectionEntriesStore extends ChildStore
{
 protected $collection;
 private bool $shouldBlinkEntryUris = true;

 protected function collection()
 {
Expand DownExpand Up@@ -95,6 +98,10 @@ public function makeItemFromFile($path, $contents)
 $entry->date((new GetDateFromPath)($path));
 }

 // Blink the entry so that it can be used when building the URI. If it's not
 // in there, it would try to retrieve the entry, which doesn't exist yet.
 Blink::store('structure-entries')->put($id, $entry);

 if (isset($idGenerated) || isset($positionGenerated)) {
 $this->writeItemToDiskWithoutIncrementing($entry);
 }
Expand DownExpand Up@@ -217,4 +224,37 @@ protected function writeItemToDisk($item)

 $item->writeFile($path);
 }

 protected function cacheItem($item)
 {
 $key = $this->getItemKey($item);

 $cacheKey = $this->getItemCacheKey($key);

 Cache::forever($cacheKey, ['entry' => $item, 'uri' => $item->uri()]);
 }

 protected function getCachedItem($key)
 {
 $cacheKey = $this->getItemCacheKey($key);

 if (! $cache = Cache::get($cacheKey)) {
 return null;
 }

 if ($this->shouldBlinkEntryUris && $cache['uri']) {
 Blink::store('entry-uris')->put($cache['entry']->id(), $cache['uri']);
 }

 return $cache['entry'];
 }

 public function withoutBlinkingEntryUris($callback)
 {
 $this->shouldBlinkEntryUris = false;
 $return = $callback();
 $this->shouldBlinkEntryUris = true;

 return $return;
 }
}

17 changes: 13 additions & 4 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,20 @@ protected function getDefaultPublishState($data)

 public function updateEntryUris($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('uri');
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 $this->updateEntriesWithinIndex($index, $ids);
 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
Expand Down

4 changes: 2 additions & 2 deletions
tests/Antlers/Runtime/PartialsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function test_sections_work_inside_the_main_slot_content()
 {
 Collection::make('pages')->routes('{slug}')->save();

 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('/')->create();
 EntryFactory::collection('pages')->id('1')->data(['title' => 'The Title', 'content' => 'The content'])->slug('test')->create();

 $layout = <<<'LAYOUT'
{{ yield:test }}
Expand All@@ -59,7 +59,7 @@ public function test_sections_work_inside_the_main_slot_content()
 $this->viewShouldReturnRaw('default', $default);
 $this->viewShouldReturnRaw('test', $partial);

 $response = $this->get('/')->assertOk();
 $response = $this->get('test')->assertOk();
 $content = trim(StringUtilities::normalizeLineEndings($response->content()));

 $expected = <<<'EXPECTED'
Expand Down

20 changes: 10 additions & 10 deletions
tests/Antlers/Runtime/RuntimeValuesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,16 +20,6 @@ public function test_supplemented_values_are_not_cached()
 {
 $this->withFakeViews();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $instance = (new class extends Tags
 {
 public static $handle = 'dont_cache';
Expand All@@ -49,6 +39,16 @@ public function mePlease()

 $instance::register();

 Collection::make('pages')->routes(['en' => '{slug}'])->save();
 EntryFactory::collection('pages')->id('1')->slug('home')->data(['title' => 'Home'])->create();
 EntryFactory::collection('pages')->id('2')->slug('about')->data(['title' => 'About'])->create();

 $template = <<<'EOT'
{{ title }}

{{ dont_cache:me_please }}{{ foo }}{{ /dont_cache:me_please }}
EOT;

 $this->viewShouldReturnRaw('default', $template);
 $this->viewShouldReturnRaw('layout', '{{ template_content }}');

Expand Down

7 changes: 4 additions & 3 deletions
tests/Antlers/Runtime/TagCheckScopeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,9 +132,6 @@ public function test_node_processor_does_not_trash_scope_when_checking_if_someth

 public function test_condition_augmentation_doesnt_reset_up_the_scope()
 {
 $this->createData();
 $this->withFakeViews();

 (new class extends Tags
 {
 public static $handle = 'just_a_tag';
Expand All@@ -144,6 +141,10 @@ public function index()
 return [];
 }
 })::register();

 $this->createData();
 $this->withFakeViews();

 $template = <<<'EOT'

{{ just_a_tag }}
Expand Down

11 changes: 6 additions & 5 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -637,8 +637,6 @@ public function a_localized_entry_in_a_structured_collection_without_a_route_for
 */
 public function it_gets_urls_for_first_child_redirects($value)
 {
 \Event::fake(); // Don't invalidate static cache etc when saving entries.

 $this->setSites([
 'en' => ['url' => 'http://domain.com/', 'locale' => 'en_US'],
 ]);
Expand DownExpand Up@@ -1356,7 +1354,7 @@ public function when_saving_quietly_the_cached_entrys_withEvents_flag_will_be_se

 $entry->saveQuietly();

 $cached = Cache::get('stache::items::entries::blog::1');
 $cached = Cache::get('stache::items::entries::blog::1')['entry'];
 $reflection = new ReflectionClass($cached);
 $property = $reflection->getProperty('withEvents');
 $property->setAccessible(true);
Expand All@@ -1375,8 +1373,11 @@ public function it_clears_blink_caches_when_saving()
 $mock->shouldReceive('store')->with('structure-uris')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 );
 $mock->shouldReceive('store')->with('structure-entries')->once()->andReturn(
 $this->mock(\Spatie\Blink\Blink::class)->shouldReceive('forget')->with('a')->once()->getMock()
 $mock->shouldReceive('store')->with('structure-entries')->twice()->andReturn(
 tap($this->mock(\Spatie\Blink\Blink::class), function ($m) {
 $m->shouldReceive('forget')->with('a')->once();
 $m->shouldReceive('put')->once();
 })
 );

 $entry->save();
Expand Down

2 changes: 1 addition & 1 deletion
tests/Data/Structures/TreeTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@ public function it_gets_the_parent()
 $parent = $tree->parent();

 $this->assertInstanceOf(Page::class, $parent);
 $this->assertEquals(Entry::find('pages-home'), $parent->entry());
 $this->assertEquals(Entry::find('pages-home')->id(), $parent->entry()->id());
 }

 /** @test */
Expand Down

12 changes: 6 additions & 6 deletions
tests/Feature/Entries/MountingTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ public function updating_a_mounted_page_will_update_the_uris_for_each_entry_in_t
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 $mount->slug('diary')->save();

 $this->assertNull(Entry::findByUri('/pages/blog/one'));
 $this->assertNull(Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one, Entry::findByUri('/pages/diary/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/diary/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/diary/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/diary/two')->id());
 }

 /** @test */
Expand All@@ -54,8 +54,8 @@ public function updating_a_mounted_page_will_not_update_the_uris_when_slug_is_cl
 $one = EntryFactory::collection('blog')->slug('one')->create();
 $two = EntryFactory::collection('blog')->slug('two')->create();

 $this->assertEquals($one, Entry::findByUri('/pages/blog/one'));
 $this->assertEquals($two, Entry::findByUri('/pages/blog/two'));
 $this->assertEquals($one->id(), Entry::findByUri('/pages/blog/one')->id());
 $this->assertEquals($two->id(), Entry::findByUri('/pages/blog/two')->id());

 // Since we're just saving the mount without changing the slug, we don't want to update the URIs.
 $mock = \Mockery::mock(Collection::getFacadeRoot())->makePartial();
Expand Down

6 changes: 3 additions & 3 deletions
tests/Stache/Stores/EntriesStoreTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ public function it_makes_entry_instances_from_files()
 public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -122,7 +122,7 @@ public function if_slugs_are_not_required_the_filename_still_becomes_the_slug()
 public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id_then_slug_is_null()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(false)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(false)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand All@@ -138,7 +138,7 @@ public function if_slugs_are_not_required_and_the_filename_is_the_same_as_the_id
 public function if_slugs_are_required_and_the_filename_is_the_same_as_the_id_then_slug_is_the_id()
 {
 Facades\Collection::shouldReceive('findByHandle')->with('blog')->andReturn(
 (new \Statamic\Entries\Collection)->requiresSlugs(true)
 (new \Statamic\Entries\Collection)->handle('blog')->requiresSlugs(true)
 );

 $item = $this->parent->store('blog')->makeItemFromFile(
Expand Down