Skip to content

[5.0] Update deleted files and folders to changes of today and delete 4.4 update SQL scripts - #40676

Merged
HLeithner merged 4 commits into
joomla:5.0-devfrom
richard67:5.0-dev-deleted-files-and-folders_2023-05-29
May 29, 2023
Merged

[5.0] Update deleted files and folders to changes of today and delete 4.4 update SQL scripts#40676
HLeithner merged 4 commits into
joomla:5.0-devfrom
richard67:5.0-dev-deleted-files-and-folders_2023-05-29

Conversation

@richard67

@richard67 richard67 commented May 29, 2023

Copy link
Copy Markdown
Member

Pull Request for Issue # .

Summary of Changes

This pull request (PR) updates the lists of deleted files and folders in script.php to the latest changes from PRs #40524 , #40626 and #40674 .

In addition, it fixes inconsistent ordering in the list of deleted files. It should always be ordered case-insensitive in ascending order, and the list of folders should always be case-insensitive in descending order.

It also removes entries from the lists which have become obsolete due to dependency updates. As long as we haven't released alpha 1 yet, there is no need to keep them.

Finally it removes the 4.4 update SQL scripts which have been added by mistake with the last upmerge.

Testing Instructions

Code review.

Or if you want to make a real test, update the last 4.4 nightly build to the last 5.0 nightly build to get the actual result, and update the last 4.4 nightly build to the update package built by Drone for this PR to get the expected result.

Actual result BEFORE applying this Pull Request

The following files are still present after the update:

'/administrator/components/com_admin/sql/updates/mysql/4.3.2-2023-03-31.sql',
'/administrator/components/com_admin/sql/updates/mysql/4.3.2-2023-05-03.sql',
'/administrator/components/com_admin/sql/updates/postgresql/4.3.2-2023-03-31.sql',
'/administrator/components/com_admin/sql/updates/postgresql/4.3.2-2023-05-03.sql',
'/libraries/vendor/nyholm/psr7/phpstan-baseline.neon',
'/libraries/vendor/nyholm/psr7/psalm.baseline.xml',
'/libraries/vendor/nyholm/psr7/src/StreamTrait.php',
'/libraries/vendor/psr/http-message/docs/PSR7-Interfaces.md',
'/libraries/vendor/psr/http-message/docs/PSR7-Usage.md',
'/media/vendor/fontawesome-free/scss/_larger.scss',
'/media/vendor/fontawesome-free/webfonts/fa-brands-400.eot',
'/media/vendor/fontawesome-free/webfonts/fa-brands-400.svg',
'/media/vendor/fontawesome-free/webfonts/fa-brands-400.woff',
'/media/vendor/fontawesome-free/webfonts/fa-regular-400.eot',
'/media/vendor/fontawesome-free/webfonts/fa-regular-400.svg',
'/media/vendor/fontawesome-free/webfonts/fa-regular-400.woff',
'/media/vendor/fontawesome-free/webfonts/fa-solid-900.eot',
'/media/vendor/fontawesome-free/webfonts/fa-solid-900.svg',
'/media/vendor/fontawesome-free/webfonts/fa-solid-900.woff',
'/media/vendor/tinymce/plugins/template/index.js',
'/media/vendor/tinymce/plugins/template/plugin.js',
'/media/vendor/tinymce/plugins/template/plugin.min.js',
'/media/vendor/tinymce/plugins/template/plugin.min.js.gz',

Besides this there are also the following files present, and they would also be included in a new installation:

'/administrator/components/com_admin/sql/updates/mysql/4.4.0-2023-05-08.sql',
'/administrator/components/com_admin/sql/updates/postgresql/4.4.0-2023-05-08.sql',

Expected result AFTER applying this Pull Request

The files mentioned in the previous section "Actual result BEFORE applying this Pull Request" are not present after an update.

Folders "/media/vendor/tinymce/plugins/template" and "/libraries/vendor/psr/http-message/docs" have been removed completely.

The "4.4.0-2023-05-08.sql" files are not included in the full package for a new installation or the update package and removed from the sources with this PR.

Link to documentations

Please select:

  • No documentation changes for docs.joomla.org needed

  • No documentation changes for manual.joomla.org needed

@richard67 richard67 changed the title [5.0] [WiP] Update deleted files and folders to changes of today and delete 4.4 update SQL scripts [5.0] Update deleted files and folders to changes of today and delete 4.4 update SQL scripts May 29, 2023
@richard67
richard67 marked this pull request as ready for review May 29, 2023 11:52
@richard67 richard67 added this to the Joomla! 5.0 milestone May 29, 2023
@HLeithner
HLeithner merged commit ea407ef into joomla:5.0-dev May 29, 2023
@HLeithner

Copy link
Copy Markdown
Member

thanks

@richard67
richard67 deleted the 5.0-dev-deleted-files-and-folders_2023-05-29 branch May 29, 2023 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants