Repository navigation
upd(sync): merge 3.5.x fixes into 3.6.x - #2526
Merged
Merged
Conversation
…fix-store-installer-csrf fix(store): preserve CSRF token in legacy installer form
…lone fix(tests): standalone scripts testing
…he-images fix(core): thumbnails default server rules and thumbnails generation security
…e-indicator fix(manager): resource change indicator after save and continue
…name-symbols-validation fix(core): session proxy filename validation
This reverts commit b8cfb08.
…-sync-selected-folder Fix file manager sync selected folder
Keep the 3.6 upgrade and neutralize the 3.5-only downgrade in revert 45816e4. Preserve both branch histories for future synchronizations; adapt inherited tests and patch Pest/PHPUnit to clear the current advisory.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge the 3.5.x fixes through
274abb9f4into a branch based on 3.6.x, preserving both histories. This replaces the conflicting direct 3.5.x → 3.6.x approach in #2524 without changing the maintained 3.5.x branch.The merge retains the 3.6 upgrade despite the 3.5-only revert
45816e4e0: CMS 3.6.0, PHP ^8.4.1, Laravel 13, Guzzle 8, Symfony Process 8, Pest 5, and the bundled 3.6 packages. Docker defaults remain PHP 8.4; the shared CI version selector chooses 8.4/8.5 plus the strict 8.6 RC check for 3.6. KeepManagerActivity::onlineUsers()and its dashboard integration, and combine the new file-browser folder selection with 3.6 SVG icons.Adapt inherited regression tests to the 3.6 online-user reader and existing cache image permissions. Update only locked development tools Pest 5.3.3 → 5.3.4 and PHPUnit 13.4.3 → 13.4.5 to clear GHSA-9vw2-f4vp-x7gf; runtime packages and manifest constraints remain unchanged.
Validation:
Merge this PR with a merge commit, retaining the ancestry from 3.5.x. Squashing or rebasing would discard the integration history needed by later branch synchronizations. The 3.5-only revert remains in history but its downgrade is neutralized in the merge result, so it is already accounted for in future merges.