[#45846] - [6.0] Upmerge 2025-08-05
- Fixed in Code Base
- 5 Aug 2025
- Medium
- Build: 5.4-dev
- # 45846
- Diff
- richard67:6.0-dev-upmerge-2025-08-05
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 #45805 .
In addition, this PR updates the phpstan-baseline.neon by removing the rules which became obsolete due to the upmerge of PR #45814 .
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.
- Check the changes made by this PR on the phpstan-baseline.neon file.
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.
There are only entries removed from the phpstan-baseline.neon file, no new entries are added.
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 | ⇒ | Repository Administration com_admin SQL |
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2025-08-05 16:41:41 |
| Closed_By | ⇒ | softforge | |
| Labels |
Added:
PR-6.0-dev
|
||
| Category | Repository Administration com_admin SQL | ⇒ | Administration com_config com_content com_finder com_installer com_joomlaupdate Language & Strings Modules Repository JavaScript |
Thank you so much @richard67 you are an absolute star!! (That's British speak for "a good egg")