Skip to content
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.1] Update deleted files and folders lists in script.php for 5.1.1 #43461

Conversation

richard67
Copy link
Member

@richard67 richard67 commented May 12, 2024

Pull Request for Issue # .

Summary of Changes

This pull request (PR) updates the lists of files and folders to be deleted on update in file administrator/components/com_admin/script.php in the 5.1-dev branch in preparation for the upcoming 5.1.1 release.

All entries added to the lists are caused by the different handling of the composer dependency laminas/laminas-diactoros on the last 4.4.4 and 5.1.0 releases due to security patches:

  • In 4.4.4 we could not update that dependency to a newer version because that version would not support PHP 7.4. Therefore a new composer dependency cweagans/composer-patches was added, which patches the older version with the same security fixes as we would get with the latest version. See this commit: 92f2ffb
  • In 5.1.0 the laminas/laminas-diactoros was already up to date. It had been updated with 5.0.0 to version 2.24.0 which includes the security fixes which were patched in 4.4.4.

Therefore the new composer dependency cweagans/composer-patches added to 4.4-dev is not needed in 5.1-dev, so this PR here removes it when updating a 4.4.4 or later to 5.1.1 or later, and it removes the patch information PATCHES.txt from the folder of the laminas/laminas-diactoros dependency which was created by the removed tool.

Testing Instructions

Code review, or if you want to do a real test:

Update the latest 4.4 nightly build to the latest 5.1 nightly build to get the actual result, and update latest 4.4 nightly build to the patched package created by Drone for this PR to get the expected result.

Here you can find the patched update package or custom update URL created by Drone for this PR: https://artifacts.joomla.org/drone/joomla/joomla-cms/5.1-dev/43461/downloads/76100/

Actual result BEFORE applying this Pull Request

The files and folders added by this PR to file administrator/components/com_admin/script.php are still present after the update.

Expected result AFTER applying this Pull Request

The files and folders added by this PR to file administrator/components/com_admin/script.php have been removed with the update.

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.1] Update deleted files list in script.php for 5.1.1 [5.1] Update deleted files and folders lists in script.php for 5.1.1 May 12, 2024
@richard67
Copy link
Member Author

@LadySolveig Not merged yet by purpose? Or just forgotten?

@LadySolveig LadySolveig merged commit fcf0ad1 into joomla:5.1-dev May 14, 2024
3 checks passed
@LadySolveig
Copy link
Contributor

Thank you @richard67 !

@richard67 richard67 deleted the 5.1-dev-deleted-files-and-folders-2024-04-27 branch May 14, 2024 12:34
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.

None yet

3 participants