Skip to content

[5.4] Upmerge 2025-07-29#45803

Merged
richard67 merged 7 commits intojoomla:5.4-devfrom
muhme:5.4-upmerge-2025-07-29
Jul 29, 2025
Merged

[5.4] Upmerge 2025-07-29#45803
richard67 merged 7 commits intojoomla:5.4-devfrom
muhme:5.4-upmerge-2025-07-29

Conversation

@muhme
Copy link
Contributor

@muhme muhme commented Jul 29, 2025

Summary of Changes

This pull request (PR) merges the changes from 5.3-dev up into 5.4-dev which have been made since the last upmerge PR #45771 from 24 July (five days ago, with removing Drone tests).

There were 5 PR merged. Only one with conflict: README.md with new build status table, which was taken

Testing Instructions

Review. Check the commits of this PR and those in the 5.3-dev branch.

Actual result BEFORE applying this Pull Request

5.4-dev branch is not up to date with 5.3-dev.

Expected result AFTER applying this Pull Request

5.4-dev branch is up to date with 5.3-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

Hackwar and others added 6 commits July 24, 2025 14:34
* 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>
…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>
@richard67 richard67 dismissed heelc29’s stale review July 29, 2025 16:20

Suggested change is implemented.

@richard67 richard67 merged commit 2e41f21 into joomla:5.4-dev Jul 29, 2025
40 checks passed
@richard67
Copy link
Member

Thanks @muhme for the upmerge PR, and thanks @heelc29 for the version adjustment of the new badge in the readme. I had that on my to do list but you saved me some work.

@muhme muhme deleted the 5.4-upmerge-2025-07-29 branch July 31, 2025 13:54
@muhme muhme mentioned this pull request Aug 5, 2025
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants