[6.0] Upmerge 2025-08-05 #45846
Merged
[6.0] Upmerge 2025-08-05 #45846
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
Corrects the test description code review only needed Signed-off-by: BrianTeeman <brian@teeman.net>
* mod_logged converted to service provider
* mod_privacy_dashboard to service provider
* Ignore errors in PHPStan for deprecation errors, will be solved in J6, with the update of the database framework from 3 to 4
* API filter articles by their checked out status and user * Administrator backend with checked out article filter
* mod_finder converted to service provider
* Update npm dependencies --------- Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
…joomla#45832) * Add deleted files from PRs joomla#45762 and joomla#45775 * Add deleted files from PRs joomla#45801 , joomla#45807 and joomla#45815
icon changed as in joomla#45669
Clean PHP deprecated: array_slice(): Passing null to parameter #2 ($offset) of type int is deprecated
[5.4] upmerge 2025-08-05
richard67
requested review from
HLeithner,
bembelimen,
chmst,
laoneo and
rdeutz
as code owners
Contributor
|
Thank you so much @richard67 you are an absolute star!! (That's British speak for "a good egg") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 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 #45805 .
In addition, this PR updates the
phpstan-baseline.neonby 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:
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