-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[5.4] Upmerge changes from 5.3-dev 2025-02-28 #45035
Merged
richard67
merged 37 commits into
joomla:5.4-dev
from
richard67:5.4-dev-upmerge-2025-02-28
Feb 28, 2025
Merged
[5.4] Upmerge changes from 5.3-dev 2025-02-28 #45035
richard67
merged 37 commits into
joomla:5.4-dev
from
richard67:5.4-dev-upmerge-2025-02-28
Feb 28, 2025
+523
−465
Conversation
This file contains 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
Loading status checks…
Loading status checks…
Loading status checks…
…of type string is deprecated (joomla#44876)
Loading status checks…
Loading status checks…
* Combine multiple unset call into one call * Remove unnecessary blank lines * Move comments to right position * Update administrator/components/com_templates/src/Model/TemplateModel.php Co-authored-by: Harald Leithner <leithner@itronic.at> * Update libraries/src/User/User.php Co-authored-by: Harald Leithner <leithner@itronic.at>
Loading status checks…
…44982) * Change isset($var) && multiple times to one call * Remove redundant checks * Update components/com_users/src/View/Profile/HtmlView.php --------- Co-authored-by: Quy Ton <quy@nomonkeybiz.com> Co-authored-by: Harald Leithner <leithner@itronic.at>
Loading status checks…
Co-authored-by: Harald Leithner <leithner@itronic.at>
Co-authored-by: Harald Leithner <leithner@itronic.at>
Loading status checks…
* Change list() to array destruct for libraries code
Loading status checks…
…oomla#44970) * Change list() to array destruct for modules and plugins code --------- Co-authored-by: Quy Ton <quy@nomonkeybiz.com>
Loading status checks…
Loading status checks…
Loading status checks…
* Add deprecation message to content modules --------- Co-authored-by: Quy <quy@nomonkeybiz.com>
Loading status checks…
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Loading status checks…
Loading status checks…
Loading status checks…
Loading status checks…
The `CYPRESS_CACHE_FOLDER` environment variable must be set within the `sudo` command.
* [Cypress] PHP Backend Notice com_media/Files.cy.js Fixing all Joomla backend PHP notices from Cypress test file `api/com_media/Files.cy.js` and doing some refactoring. Fixed PHP notices are: ``` [Sat Feb 22 18:28:44.019593 2025] [php:notice] [pid 31:tid 31] [client 10.0.0.1:64714] PHP Notice: exif_imagetype(): Error reading from /var/www/html/files/test-image-1.jpg! in /var/www/html/libraries/src/Helper/MediaHelper.php on line 93 [Sat Feb 22 18:28:44.022074 2025] [php:notice] [pid 31:tid 31] [client 10.0.0.1:64714] PHP Notice: getimagesize(): Error reading from /var/www/html/files/test-image-1.jpg! in /var/www/html/libraries/src/Image/Image.php on line 177 [Sat Feb 22 18:28:44.258619 2025] [php:notice] [pid 31:tid 31] [client 10.0.0.1:64714] PHP Notice: exif_imagetype(): Error reading from /var/www/html/files/test-dir/test-image-1-subfolder.jpg! in /var/www/html/libraries/src/Helper/MediaHelper.php on line 93 [Sat Feb 22 18:28:44.259092 2025] [php:notice] [pid 31:tid 31] [client 10.0.0.1:64714] PHP Notice: getimagesize(): Error reading from /var/www/html/files/test-dir/test-image-1-subfolder.jpg! in /var/www/html/libraries/src/Image/Image.php on line 177 [Sat Feb 22 18:28:47.177357 2025] [php:notice] [pid 31:tid 31] [client 10.0.0.1:64714] PHP Notice: exif_imagetype(): Error reading from /var/www/html/files/test-dir/todelete.jpg! in /var/www/html/libraries/src/Helper/MediaHelper.php on line 93 [Sat Feb 22 18:28:47.178099 2025] [php:notice] [pid 31:tid 31] [client 10.0.0.1:64714] PHP Notice: getimagesize(): Error reading from /var/www/html/files/test-dir/todelete.jpg! in /var/www/html/libraries/src/Image/Image.php on line 177 [Sat Feb 22 18:28:47.564807 2025] [php:notice] [pid 31:tid 31] [client 10.0.0.1:64714] PHP Notice: exif_imagetype(): Error reading from /var/www/html/images/test-dir/todelete.jpg! in /var/www/html/libraries/src/Helper/MediaHelper.php on line 93 [Sat Feb 22 18:28:47.565288 2025] [php:notice] [pid 31:tid 31] [client 10.0.0.1:64714] PHP Notice: getimagesize(): Error reading from /var/www/html/images/test-dir/todelete.jpg! in /var/www/html/libraries/src/Image/Image.php on line 177 ``` All 8 x PHP notices are fixed. Instead of using 1-Byte files real images are used from Cypress fixtures. Please consider there are still 4 x PHP warning to be fixed (I assume they need to be fixed in PHP API backend code) from `api/com_media/Files.cy.js` and more warnings and notices in the overall Joomla System Tests. Some refactoring: * Deleted 3 images in `tests/System/data/com_media`, 2 are not used and Cypress default is to use `fixtures` folder * The image file names are counted through and the images show name and path in different colors. * Second `test-dir` was named `test-dir2` to distinguish clearly. * `afterEach()` is reduced to `after()`, as it is only a clean-up and not needed to execute the tests. * The last 4 tests can use the prepared files too, as with `beforeEach` the files are restored before each test. * Corrected Image Description to test-dir2 Used command: ``` convert -size 100x100 -gravity center -pointsize 11 xc:lightgreen -fill red -annotate +0+0 'Joomla\nSystem Tests\n\nimages/test-dir2\ntest-image-3.jpg' tests/System/fixtures/com_media/test-image-3.jpg ``` * Fix for Windows Path and Read-Only Overwrites - Creating relative fixtures folder path now also works on Windows with backslashes as separators and a drive letter - All overwrite files are now created with explicit read-write 0o666, as the default 0o444 creates read-only files, leading to PHP Warnings `Failed to open` --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com> Co-authored-by: Robert Deutz <rdeutz@googlemail.com>
Loading status checks…
Loading status checks…
…2025-02-28
Loading status checks…
…2-28
Loading status checks…
…2025-02-28
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.3-dev up into 5.4-dev which have been made since the last upmerge PR #45009 .
Important hint for maintainers
This PR has to be merged with a merge commit, not a squash commit.
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