') + ')', '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); } })(); })(); fix(upgrade): actually modernize phpunit XML configs by imorland · Pull Request #56 · flarum/cli · GitHub
Skip to content

fix(upgrade): actually modernize phpunit XML configs - #56

Merged
imorland merged 2 commits into
3.xfrom
im/upgrade-phpunit-configs
Aug 2, 2026
Merged

fix(upgrade): actually modernize phpunit XML configs#56
imorland merged 2 commits into
3.xfrom
im/upgrade-phpunit-configs

Conversation

@imorland

@imorlandimorland commented Aug 2, 2026

Copy link
Copy Markdown
Member

The bug — the XML rewrite has never run

Found while modernizing fof/synopsis's configs by hand (FriendsOfFlarum/synopsis#7) and asking why the upgrade tool hadn't already done it. Two independent defects, either fatal alone:

replacements(file: string): Replacement[]{if(!file.endsWith('.php'))return[];// ← XML files never get replacementsreturn[
...,(file,code)=>{if(!file.endsWith('.xml'))returnnull;// ← unreachablereturn{// ← String.replace with regex syntax in a plain string: literal match, hits nothingupdated: code.replace('xsi:noNamespaceSchemaLocation="([^"]+)"','...'),};},];}

So every extension run through upgrade:2.0 kept its PHPUnit 9.3-era config — which PHPUnit 12 tolerates but flags as a deprecation on every run, hides query-guard warnings behind summary counts, and pins the schema to a URL that no longer matches the installed phpunit.

The fix

modernizePhpunitXml() in its own dependency-free module, wired through a restructured dispatch (.php and phpunit*.xml each get their own path; root-level phpunit.xml added to targets). The transform converts to the shape this CLI scaffolds:

  • schema from the vendored phpunit, depth-aware (tests/… → ../vendor/…, root → vendor/…)
  • removed-in-10 attributes dropped; backupStaticAttributes → backupStaticProperties keeping its value
  • cacheDirectory + displayDetailsOnTestsThatTriggerWarnings inserted in scaffold order
  • <coverage> → <source> (include list preserved); <listeners> removed
  • testsuites and per-file settings untouched; idempotent on already-modern configs

Verification

  • 9 new jest tests written RED first (fixtures are synopsis's actual old configs): schema paths at both depths, attribute removal/rename, insertions, coverage→source, listeners removal, preservation, idempotency
  • Full suite 190/190, Prettier clean
  • End-to-end: the built binary run against a fixture extension carrying the old config produced byte-for-byte the scaffolded modern shape

@imorland
fix(upgrade): actually modernize phpunit XML configs
1f70c2a
The upgrade step's XML rewrite has never run: the callback sat behind
an early return that only let .php files through, and even if reached,
it called String.replace with regex syntax in a plain string — a
literal match that hits nothing. Every upgraded extension kept its
PHPUnit 9.3-era config, which PHPUnit 12 flags as a deprecation on
every run.
The rewrite is now a real transform in its own module, converting
configs to the shape the CLI scaffolds: schema resolved from the
vendored phpunit (relative to the config's own directory, so root-level
configs resolve without ../), the attributes PHPUnit 10 removed dropped
or renamed (backupStaticAttributes becomes backupStaticProperties with
its value kept), cacheDirectory and
displayDetailsOnTestsThatTriggerWarnings inserted in scaffold order so
flarum/testing's query guard warnings surface in output, coverage's
include list moved to <source>, and the Mockery listeners block
removed. Testsuites and per-file settings are preserved, and the
transform is idempotent on already-modern configs.
Root-level phpunit.xml files are now targeted alongside tests/.
@imorland
style: satisfy unicorn/better-regex
40c3f5d
@imorland
imorland merged commit 7cde039 into 3.xAug 2, 2026
3 checks passed
@imorland
imorland deleted the im/upgrade-phpunit-configs branch August 2, 2026 11:57
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

@imorland