') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [6.x] Fix template scanning on Windows junctions by jasonvarga · Pull Request #15145 · statamic/cms · GitHub
Skip to content

[6.x] Fix template scanning on Windows junctions - #15145

Merged
jasonvarga merged 8 commits into
6.xfrom
probe/windows-junctions
Aug 9, 2026
Merged

[6.x] Fix template scanning on Windows junctions#15145
jasonvarga merged 8 commits into
6.xfrom
probe/windows-junctions

Conversation

@jasonvarga

@jasonvargajasonvarga commented Aug 9, 2026

Copy link
Copy Markdown
Member

Two Windows bugs, one of which was hiding the other.

Junctions aren't traversed when scanning view paths

TemplatesController and the TemplateFolder fieldtype both walk view.paths with RecursiveDirectoryIterator and FOLLOW_SYMLINKS. A Windows junction reports an lstat mode that is neither a link nor a directory, so hasChildren() takes its "not a link" branch, returns false, and never reaches the FOLLOW_SYMLINKS code path at all.

The upshot for a Windows user with a junction under resources/views: the junction is offered as a selectable template or folder in its own right, and the templates inside it don't show up. Real symlinks were always fine — only junctions were affected, which is what non-elevated Windows tooling tends to produce, Filesystem::link() included.

Fixed with a RecursiveDirectoryIterator subclass that falls back to is_dir(). The clearstatcache() is load-bearing: parent::hasChildren() has just lstat'd the path, and is_dir() would otherwise be served that cached result and answer false. Verified on Windows CI — this is php/php-src#9674 and can be dropped if that's ever fixed upstream.

The tests were leaking into each other

TemplatesTest and TemplateFolderTest shared tests/Fieldtypes/templates-test-tmp, and both tore it down with deleteDirectory(), which reaches for unlink(). On Windows unlink() refuses anything carrying the directory attribute, so symlinked and junctioned directories survived teardown along with every directory above them.

TemplateFolderTest sorts immediately before TemplatesTest and creates identically named links. Its leftovers survived into TemplatesTest, whose own mklink /J then failed against the paths that already existed — silently, since Filesystem::link() discards the exit code. So TemplatesTest has been asserting against its sibling's leftover symlinks since #10031, and its symlink coverage never once exercised the code it appeared to.

That's why this only surfaced when #15140 sharded the suite and split the two classes apart. Each class now gets its own directory and a teardown that can actually remove reparse points.

Notes

TemplatesTest deliberately keeps using app('files')->link(), so on Windows it creates junctions and covers the fix above, while TemplateFolderTest uses symlink() and covers real symlinks. Between them both link types are exercised on Windows CI.

Statamic\Facades\File::deleteDirectory() has the same Windows blind spot as Laravel's and will leak reparse points anywhere else it's used on a tree containing them. Left alone here — it's a wider change than this PR wants to be.

The probe commits are kept deliberately. They're a throwaway workflow that ran each hypothesis on Windows CI, and they record why the obvious fix doesn't work.

jasonvargaand others added 8 commits August 8, 2026 23:50
@jasonvarga@claude
Add throwaway Windows junction probe
9811425
Not for merging. Confirms two things on Windows CI:
1. PHP does not recurse into mklink /J junctions via RecursiveDirectoryIterator
with FOLLOW_SYMLINKS, but does recurse into real symlinks.
2. deleteDirectory() cannot remove directory symlinks, so TemplateFolderTest
leaks them into the directory TemplatesTest reuses.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@jasonvarga@claude
Probe a candidate fix for junction traversal
3bd1ab2
Overrides hasChildren() to fall back to is_dir(), which is true for junctions.
Checks that recursion continues from the unresolved pathname so template names
keep their virtual prefix.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@jasonvarga@claude
Instrument the hasChildren override and probe a hand-rolled scan
bc499f7
The override had no effect, so log whether it is invoked at all, and try a
plain recursive scan that leans on is_dir() instead of SPL recursion.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@jasonvarga@claude
Test whether clearstatcache rescues the hasChildren override
9863756
parent::hasChildren() lstat()s the path first, and is_dir() appears to reuse
that cached result. Compare is_dir() before and after clearing the cache.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@jasonvarga@claude
Remove the probe
9951e14
Its findings are applied in the commits that follow.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@jasonvarga@claude
Stop the template fieldtype tests leaking into each other
334ebaf
Both classes shared tests/Fieldtypes/templates-test-tmp, and their teardown used
deleteDirectory(), which cannot remove a symlinked or junctioned directory on
Windows. TemplateFolderTest's symlinks therefore survived into TemplatesTest,
which reused them instead of the links it thought it had created.
Give each class its own directory and a teardown that can remove reparse points.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@jasonvarga@claude
Traverse Windows junctions when scanning view paths
f18f800
RecursiveDirectoryIterator treats a junction as a leaf, so a junctioned folder
under a view path was offered as a bogus template and the templates inside it
were invisible. Both the Templates and Template Folder fieldtypes were affected.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@jasonvarga@claude
Remove the stat calls from the test directory cleanup
5513a27
is_link() lstat's the path, and PHP caches an lstat result as the stat result
when it decides the path isn't a link. A junction isn't reported as a link, so
the following is_dir() was served that bogus mode and answered false, sending
junctions to unlink(), which cannot remove them on Windows.
Try unlink() then rmdir() and recurse into whatever survives both, so no stat
is involved. Cover it with a test, since a teardown leak is otherwise silent.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@jasonvarga
jasonvarga merged commit 3a9ddd6 into 6.xAug 9, 2026
22 checks passed
@jasonvarga
jasonvarga deleted the probe/windows-junctions branch August 9, 2026 21:57
jasonvarga added a commit that referenced this pull request Aug 9, 2026
@jasonvarga
Harden skeleton deletion against Windows reparse points
b534008
Three changes, all following DeletesDirectories from #15145.
The purge deletes whole trees, so it uses the trait directly. The restore deletes a
computed diff of individual paths rather than a tree, so it takes the technique
instead: unlink() then rmdir(), never asking what the path is, since a junction
reports an lstat mode that makes is_dir() and is_link() contradict each other.
The scan mattered most. It used the same ambiguous answer to decide whether to
recurse, so a junction that said "directory" would have had its target's contents
recorded as skeleton paths - and the restore would then have deleted files from
wherever that junction pointed. It now descends only into paths that resolve to
somewhere inside the skeleton.
This was referenced Aug 9, 2026
Merged
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@jasonvarga