. That stored * path pointed at a folder that doesn't exist, which broke the admin thumbnail * and any later delete check against the field's folder. */ #[CoversClass(BlueprintPathResolver::class)] class BlueprintPathResolverPageFolderTest extends TestCase { private string $root; protected function setUp(): void { $this->root = sys_get_temp_dir() . '/bpr-' . bin2hex(random_bytes(4)); mkdir($this->root . '/user/pages/01.home', 0777, true); mkdir($this->root . '/user/pages/02.blog/03.my-post', 0777, true); } protected function tearDown(): void { Grav::resetInstance(); $this->removeTree($this->root); } private function removeTree(string $dir): void { if (is_link($dir)) { unlink($dir); return; } $it = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::CHILD_FIRST ); foreach ($it as $f) { ($f->isDir() && !$f->isLink()) ? rmdir((string) $f) : unlink((string) $f); } rmdir($dir); } private function resolver(array $routes): BlueprintPathResolver { $user = $this->root . '/user'; $locator = new class ($user) { public function __construct(private string $user) {} public function findResource(string $uri, bool $absolute = true, bool $first = false): string|false { return $uri === 'user://' ? $this->user : false; } public function isStream(string $uri): bool { return str_contains($uri, '://'); } }; $pages = new class ($routes, $user, $this->root) { public function __construct(private array $routes, private string $user, private string $root) {} public function find(string $route): ?object { $folder = $this->routes[$route] ?? null; if ($folder === null) { return null; } // Like core, the page path is built from the pages stream and // never run through realpath, and relativePagePath() is that // path relative to the Grav root. $path = $this->user . '/pages/' . $folder; return new class ($path, $this->root) { public function __construct(private string $path, private string $root) {} public function path(): string { return $this->path; } public function relativePagePath(): string { return substr($this->path, strlen($this->root) + 1); } }; } }; return new BlueprintPathResolver(TestHelper::createMockGrav(['locator' => $locator, 'pages' => $pages])); } #[Test] public function self_destination_on_a_page_uses_the_numbered_folder(): void { $resolver = $this->resolver(['/home' => '01.home']); $this->assertSame('pages/01.home', $resolver->logicalParent('self@', 'pages/home')); } #[Test] public function nested_pages_and_subpaths_keep_every_folder_prefix(): void { $resolver = $this->resolver(['/blog/my-post' => '02.blog/03.my-post']); $this->assertSame( 'pages/02.blog/03.my-post/images', $resolver->logicalParent('self@:images', 'pages/blog/my-post') ); } #[Test] public function a_symlinked_pages_folder_keeps_the_numbered_folder(): void { // user/pages is a symlink to a content folder outside user/, as on // shared-content and deploy setups. $this->removeTree($this->root . '/user/pages'); mkdir($this->root . '/content/pages/01.home', 0777, true); symlink($this->root . '/content/pages', $this->root . '/user/pages'); $resolver = $this->resolver(['/home' => '01.home']); $this->assertSame('pages/01.home', $resolver->logicalParent('self@', 'pages/home')); } #[Test] public function an_unknown_page_falls_back_to_the_route_form(): void { $resolver = $this->resolver([]); $this->assertSame('pages/missing', $resolver->logicalParent('self@', 'pages/missing')); } }