[#45805] - [6.0] Upmerge 2025-07-29
- Fixed in Code Base
- 30 Jul 2025
- Medium
- Build: 6.0-dev
- # 45805
- Diff
- richard67:6.0-dev-upmerge-2025-07-29
User tests: Successful: Unsuccessful:
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-hash in the composer.lock file so it matches the updated composer.json file.
Finally, it updates the phpstan-baseline.neon due 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
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Unit Tests Repository Administration com_menus Language & Strings Modules Front End com_contact com_content com_newsfeeds External Library Composer Change Layout Libraries |
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2025-07-30 06:32:47 |
| Closed_By | ⇒ | Bodge-IT | |
| Labels |
Added:
Unit/System Tests
Language Change
Composer Dependency Changed
PR-6.0-dev
|
||
Thanks for the extra work you have put in on this @richard67!