[6.0] Upmerge 2025-07-29 #45805
Merged
[6.0] Upmerge 2025-07-29 #45805
Conversation
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
Fix deprecated parameters in cookie set method calls
mod_latest converted to service provider
[5.4] Upmerge 2025-07-24
* Add CI Github workflow * install * faster * path * order * names * wait * no warning when no artefacts * integration pgsql * disable opcache * run tests with less output * no quiet * do not output the table * no hardcoded path * Better title * better * revert * normal output * use blacklist instead * restore browser * Add phpstan to github action (joomla#45634) * Add phpstan to github action * Update ci.yml * Update ci.yml * Fix mysql matrix (joomla#45636) * Reduce dependencies between steps * Migrate Appveyor tests to Github actions * Reverting Appveyor deletion * Update ci.yml --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
mod_whosonline converted to service provider
Remove deprecation AbstractView::get() in layouts
Language key with DESC instead of DESCR
* Update composer dependencies except of phpstan * Composer update phpstan * Update phpstan-baseline.neon
…oomla#45048) * [5.2] system test for multi-factor authentication * [5.3] system test for multi-factor authentication (passkey) * disable firefox
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Co-authored-by: Christian Heel <66922325+heelc29@users.noreply.github.com>
[5.4] Upmerge 2025-07-29
joomla-cms-bot
added
Composer Dependency Changed
Language Change
Contributor
|
Thanks for the extra work you have put in on this @richard67! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
Pull Request for Issue # .
Summary of Changes
This pull request (PR) merges the changes from 5.4-dev up into 6.0-dev which have been made since the last upmerge PR #45764 .
The biggest change in this upmerge is the composer dependency update from PR #45777 .
In addition, this PR updates the
content-hashin thecomposer.lockfile so it matches the updatedcomposer.jsonfile.Finally, it updates the
phpstan-baseline.neondue to the update of PHPstan from 5.4-dev.Important
@Bodge-IT @softforge This PR has to be merged with a merge commit, not squash.
Testing Instructions
Review. Check the commits of this PR and those in the 5.4-dev branch.
Actual result BEFORE applying this Pull Request
6.0-dev branch is not up to date with 5.4-dev.
Expected result AFTER applying this Pull Request
6.0-dev branch is up to date with 5.4-dev.
Link to documentations
Please select:
Documentation link for docs.joomla.org:
No documentation changes for docs.joomla.org needed
Pull Request link for manual.joomla.org:
No documentation changes for manual.joomla.org needed