--- name: merge-up description: > Cascade-merge maintained Symfony branches from oldest to newest (e.g. 6.4 → 7.4 → 8.0 → 8.1). Use when the user says "merge branches", "merge up", "cascade merge", "sync branches", or "update branches". --- # Symfony Branch Cascade Merge Merges each maintained branch into the next one, from oldest to newest. ## Progress checklist - [ ] Step 0: Pre-flight checks - [ ] Step 1: Fetch maintained branches and pull them - [ ] Step 2: Cascade merge loop --- ## Confirmation rule Whenever the skill says **"Wait for confirmation"**, treat anything other than an explicit affirmative as **no**: stop and ask the user how they want to proceed. --- ## Step 0 — Pre-flight checks ```bash git status --porcelain --untracked-files=no ``` If any output, **stop**: > "The working tree is not clean. Please commit or stash your changes first." --- ## Step 1 — Fetch maintained branches and pull them ### 1a. Get the branch list ```bash curl -s https://symfony.com/releases.json ``` Read `maintained_versions`. It is already sorted oldest → newest (e.g. `["6.4", "7.4", "8.0", "8.1"]`). Store as `BRANCHES`. ### 1b. Pull every branch For each branch in `BRANCHES`: ```bash git checkout git pull --ff-only origin ``` Using `--ff-only` ensures local branches haven't diverged from origin. If the pull fails, **stop** and report the error. --- ## Step 2 — Cascade merge loop For each consecutive pair `(SOURCE, TARGET)` in `BRANCHES`: ### 2a. Merge ```bash git checkout composer up ``` Read the merge-up notes of the incoming pull requests first. The bot copies the whole pull request description into the merge commit, so the authors' own instructions for this merge are already in the local history, and many descriptions end with a "Merge-up to ``" paragraph naming the properties to add, the style the target branch expects, or the resolved code itself: ```bash git log --merges --format=%H .. \ | xargs -I{} git log -1 --format=%B {} \ | grep -inE 'merge(d| )?-?up|adapt|on [0-9]+\.[0-9]' ``` Prefer the resolution a note gives over an equivalent one of your own: it is what the author wrote the change for and usually ran on the target branch already, and a merge commit is the wrong place for a refactor. A note also covers files that merge cleanly, which is why this runs before the merge and not only when git reports a conflict. ```bash git merge ``` Three outcomes are possible: - **Already up-to-date:** print "✓ `` already up-to-date with ``" and skip to the next pair. - **Clean merge (no conflicts):** git creates the merge commit automatically. Proceed directly to step 2c. - **Conflicts:** proceed to step 2b. ### 2b. Resolve conflicts (only when git reports conflicts) List conflicts: ```bash git diff --name-only --diff-filter=U ``` Read each conflicted file, resolve it, then `git add` it. When all are resolved: ```bash git commit --no-edit ``` #### Conflict resolution rules | File pattern | Strategy | |---|---| | `CHANGELOG*.md` | Keep entries from both sides; newer branch entries on top | | Version constants, `composer.json` branch aliases | Keep the TARGET branch value | | `.github/workflows/*.yml`, CI config | Keep the TARGET value for branch-specific pins. A new job merged from SOURCE may carry SOURCE's `php-version` (its branch minimum); bump it to the TARGET's minimum (see `min_php_requirements` in releases.json) | | Idiom the TARGET replaced (e.g. `unserialize(serialize())` - a deep-clone helper, logic extracted to a trait, a method/class removed) | Take the TARGET version; the SOURCE change is superseded. `git checkout --ours ` then re-apply any security option (e.g. `allowed_classes`) the TARGET's version happens to drop | | File the TARGET deleted (modify/delete conflict) | Keep it deleted if the TARGET removed the feature (confirm with `git log -- `); the SOURCE edit is moot. `git rm ` | | Test using docblock metadata (`@dataProvider`, `@testWith`, `@group legacy`) | Convert to attributes (`#[DataProvider(...)]`, `#[TestWith([...])]`, `#[Group(...)]`) when the TARGET runs PHPUnit 10+ (7.4/8.x here); PHPUnit ignores *all* metadata in doc-comments, so the data sets are never passed and the test errors with "too few arguments" | | Compat guard added by SOURCE (`class_exists()` / `method_exists()` fallback for a symbol that may be missing from an older sibling package) | Check whether the TARGET dropped it on purpose: `git log -S'' -- `. Symfony removes these in "Remove legacy code paths that rely on feature checks" style commits, so take SOURCE's new structure but leave the guard out | | Both sides added a member at the same spot (no overlapping content, git just collapsed them onto a shared closing) | Keep both. Give each its own terminator: two `elseif` branches each need their own `return`/closing brace, and two methods each need their own `}`. Private methods go last, after all public ones | | Code files | Merge logically based on context; when unsure, ask the user | #### Structural divergence across major versions A newer major may have removed deprecated classes, attributes, or config formats (e.g. `TaggedLocator`, XML DI config), raised the minimum PHP version, or refactored shared logic into a trait or a new utility class. When merging across such a boundary: - Remove test methods marked `@group legacy` / `#[Group('legacy')]` for deprecations the new major dropped, **and** any test/fixture/import that references a removed symbol (otherwise it fatals on the TARGET). - Each major raises the minimum PHP (min PHP per branch in releases.json `min_php_requirements`: 6.4=8.1, 7.4=8.2, 8.0=8.4). Code merged from SOURCE that branches on or polyfills a PHP below the TARGET's minimum (`\PHP_VERSION_ID < ...` guards, or `function_exists()` / `class_exists()` fallbacks for now-always-available symbols) is dead on the TARGET and can be collapsed to the modern path. The TARGET usually dropped it already, so prefer its version; clean up only where SOURCE's old-PHP code lands somewhere the TARGET had not simplified. - Prefer the TARGET branch's approach for any refactored idiom. - Fastest sanity check: look at how the *downstream* branch (one already past this divergence, e.g. 8.2 while resolving on 8.0) resolved the same files, and match it. #### Divergence a clean merge hides Most of these produce no conflict at all: the merge succeeds and the tests fail. All three show up as a merged test that is fine on SOURCE and wrong on TARGET. - **A config key the TARGET removed or deprecated.** A merged test builds a config array (`'annotations' => false`, `'profiler' => ['collect_serializer_data' => true]`) that the TARGET no longer accepts. The symptom is `Unrecognized option "x" under "framework"` with the valid list attached, or a deprecation the run reports as an issue. Drop the key: these are boilerplate, not what the test is about. Grep the whole merge diff for the key, since several merged tests usually carry it. - **Registration the TARGET gates.** The TARGET may drop a service unless something consumes it (profiler or test mode, for instance), so a merged test asserting on it fails with "You have requested a non-existent service". Do not assert on a stripped container: rebuild it the way the TARGET's own sibling tests do, keeping the assertion intact. - **A default the TARGET flipped.** SOURCE adds a code path behind a flag whose default the TARGET changed, so the new path becomes the TARGET's default and changes observable output. Both sides merge cleanly and the assertions SOURCE wrote for the old path now fail. Confirm with `git log -S' = '`, then adapt the expectations, capturing the real output from a run rather than guessing at it. After resolving, show `git diff HEAD~1` (first parent of the merge commit, i.e. the previous TARGET state) and wait for the user to confirm the resolution looks correct before proceeding. ### 2c. Run tests for affected components Extract component, bridge, and bundle names from changed files: ```bash git diff --name-only HEAD~1..HEAD ``` Paths look like `src/Symfony/{Component,Bridge,Bundle}//...`. Deduplicate, then run tests for each: ```bash ./phpunit src/Symfony/Component/ ./phpunit src/Symfony/Bridge/ ./phpunit src/Symfony/Bundle/ ``` For files under `src/Symfony/Contracts/`, run the single shared test suite: ```bash ./phpunit src/Symfony/Contracts ``` Ignore files outside these directories (root configs, `.github/`, etc.): they don't have component-level test suites. Read the whole summary line, not just the exit status: a suite can end with `Tests: N, Failures: 1` or abort on a `Fatal error` well before any `FAILURES!` banner, and ANSI colour codes sit in front of those words, so a check anchored to the start of a line reports a red run as green. If tests fail or report PHPUnit deprecations (the PHPUnit version may differ between branches), first check whether the failure is pre-existing. Cheapest test first: if the merge did not touch the failing area, it did not cause the failure. ```bash git diff --name-only HEAD~1..HEAD -- ``` Only when that is inconclusive, run the test on the TARGET before the merge (`git checkout HEAD~1`, run, `git checkout `). Beware a CI baseline as evidence: a branch tip that has not been pushed in a while keeps an old green run, and CI installs dependencies fresh on every run, so a release made in between can turn a suite red with no commit to blame. Only fix failures introduced by the merge: 1. Analyze and fix the code, including any PHPUnit deprecation notices. 2. Commit the fix: `[] Fix merge conflict resolution`. 3. Re-run failing tests until green and deprecation-free. Report any pre-existing failures to the user without attempting to fix them. #### Failures a local run cannot show Locally, every sibling `symfony/*` package resolves to the branch you are on, so cross-component drift is invisible. CI's `high-deps` job installs the newest dev of the other components and `low-deps` the oldest each `composer.json` allows, which is where merged tests break even though the merge itself is sound: - **An assertion pinned to another component's message.** A newer sibling appends to an exception message and an expectation that ended at the old last word stops matching. Assert the part that identifies the failure and leave the tail free (drop a trailing `.`, or use `expectExceptionMessageMatches()`), and fix it on the oldest branch that has the test so the cascade carries it up. - **A test in the wrong component.** A test exercising code that lives in component B but sitting in component A passes everywhere except `low-deps`, where A's `composer.json` pulls a B too old to have the feature. Move the test to B rather than raising A's constraint or skipping the case; `low-deps` is what proves A's declared constraints are honest. ### 2c-bis. Run the repo's static-analysis / hardening checks If the repo ships custom static analysis (this one has `.github/sa-tools/` with PHPStan rules and `check-hardening-tests.php`), the merge carries those rules into the TARGET, where they now apply to the TARGET's **own** code. Newer-branch code can trip rules the SOURCE introduced but never had to satisfy. Run them: ```bash php .github/sa-tools/check-hardening-tests.php # and the custom PHPStan rules, as wired in .github/workflows/static-analysis.yml ``` Fix the branch-specific gaps (e.g. add `['allowed_classes' => …]` to a bare `unserialize()`, add an `instanceof \Stringable` guard to a string-property `__unserialize()`, or add the missing regression test). These gaps are not *introduced* by the merge, but the merge makes the checks apply — so they must be green before pushing. Confirm scope with the user before a large hardening pass. Beware false positives: untracked nested `vendor/` dirs and the local PHP extension set (a missing extension falls back to a possibly-outdated polyfill) can produce findings/failures that do not exist on a clean checkout / CI. ### 2d. Ask for confirmation before pushing Show: ``` Merge: → Affected: Tests: all passing Commits since origin/: git log --oneline origin/.. Ready to push? (yes / no) ``` **Wait for confirmation.** The user may make changes themselves before confirming. ### 2e. Push and continue ```bash git push origin ``` If the push fails, **stop** and report the error. Print "✓ `` → `` done." and continue to the next pair. --- ## Final summary ``` All merges complete: 6.4 → 7.4 ✓ 7.4 → 8.0 ✓ 8.0 → 8.1 ✓ ``` --- ## Gotchas - `CHANGELOG.md` conflicts are the most common; entries must be kept from both sides, never dropped. - A merge can introduce test failures even without conflicts, because behavior from the older branch may be incompatible with newer code. Always run tests. - A **clean (no-conflict) merge still needs verification**, not just a commit: auto-merged test metadata (docblock vs attribute), security-guard slot indices, and CI version pins can each be wrong even when git reports no conflict. - Some components have slow test suites. Only run tests for components with changed files, not the entire project. - When the user states a constraint about the merge as a whole ("8.x stays on ext-redis 6"), it applies to the entire merge diff, not only to the files git flagged as conflicting. Grep the whole diff for the concept and check every hit, including root `composer.json`, static-analysis baselines, and other components' bridges. Auto-merged hunks are where a constraint like that gets lost silently. - Resolving only the conflicted hunk of a file leaves the rest of it auto-merged. When the two sides restructured the same file, read the resolved file end to end before staging it, otherwise it can end up declaring the same thing twice or dropping a `return`. ## Recurring CI failures that are not yours These recur across runs and are unrelated to any merge. Re-run the job to confirm rather than investigating the component: - Windows: `AmpHttpClientTest` idle timeouts on `localhost:8057`, and `RedisException: Redis server went away` in the Redis Messenger integration tests. - Any job: composer aborting with `curl error 60 ... SSL certificate problem`, and PHPUnit dying in `RecursiveDirectoryIterator` on a `vendor/composer/` temp directory that vanished while it was walking the tree. - Timing assertions that compare an elapsed duration against a bound (`Failed asserting that 0.0 is greater than 0`). Before writing one off, check that the group meant to exclude it is actually excluded: a marker only takes effect if the job passes the matching `--exclude-group`, and if the TARGET runs PHPUnit 10+, only if the marker is an attribute rather than a doc-comment. ## Error handling - **Never** force-push or rewrite history. - **Never** use `--no-verify` on commits. - **Never** `git add -A` (or `git add .`) while resolving: it sweeps the user's untracked working files into the merge commit. Stage the files you resolved, by name. - **Never** `git reset` in the middle of a merge: it deletes `.git/MERGE_HEAD`, and the commit that follows records a single parent, silently turning the merge into a squash. - **Never** auto-recover from a failed `git push` or `git pull`. Stop and hand control back to the user. - **Never** parallelize the cascade or run branches concurrently (e.g. via subagents): each merge depends on the previous one and shares the git working tree. Run strictly oldest to newest, one at a time.