Skip to content

[5.4] upmerge 2025-03-11#45110

Merged
muhme merged 28 commits intojoomla:5.4-devfrom
muhme:5.4-upmerge-2025-03-11
Mar 11, 2025
Merged

[5.4] upmerge 2025-03-11#45110
muhme merged 28 commits intojoomla:5.4-devfrom
muhme:5.4-upmerge-2025-03-11

Conversation

@muhme
Copy link
Contributor

@muhme muhme commented Mar 11, 2025

Upmerge 5.3-dev -> 5.4-dev

heelc29 and others added 28 commits March 2, 2025 20:37
)

* tests/System/README.md revised in 5 points

* Added paragraph 'Config commands' with missing description for `config_setParameter`
* Added web server configuration with `rewrite_module` and directory's `AllowOverride` (needed after adding SEF tests)
* Added JBT as sample for Docker integration
* Unified heading to have only first word and proper nouns to start with upercase letter
* Using 'Joomla System Tests' as proper noun and replaced different writings (e.g. CMS System Tests)

* Linked to the official Joomla Docker containers

* Revert to title case in capitalisation
* null coalescing operator

* Update components/com_users/src/Model/ResetModel.php

Co-authored-by: Tuan Pham Ngoc <github@joomdonation.com>

---------

Co-authored-by: Tuan Pham Ngoc <github@joomdonation.com>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* install  extension From Url

* remove cy.wait()

* uninstall

* Update tests/System/integration/administrator/components/com_installer/FromUrl.cy.js

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>

* Update tests/System/integration/administrator/components/com_installer/FromUrl.cy.js

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>

---------

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* [5.2][cypress] clean user session

* [5.2][cypress] Add tests for shortcut plugin

* fix description

thanks @brianteeman

---------

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
With joomla#44850 during Joomla installation the configuration parameter `force_ssl` is set to 2 (Force HTTP Entire Site).
This prevents the Joomla System Tests from running with HTTP. And as the test shows it is not necessary for the Joomla System Tests.
Even without explicit setting the parameter `force_ssl` the Joomla System Tests can be run over either HTTP or HTTPS.

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* Clean up com_templates StyleModel, fix warnings

* Prevent warnings on save

---------

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Quy Ton <quy@nomonkeybiz.com>
* cypress-php-warning

* safer-check
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-5.4-dev labels Mar 11, 2025
@muhme muhme enabled auto-merge March 11, 2025 17:37
@muhme muhme merged commit 72e1102 into joomla:5.4-dev Mar 11, 2025
3 checks passed
@richard67 richard67 added this to the Joomla! 5.4.0 milestone Mar 14, 2025
@muhme muhme deleted the 5.4-upmerge-2025-03-11 branch March 25, 2025 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Language Change This is for Translators PR-5.4-dev

Projects

None yet

Development

Successfully merging this pull request may close these issues.