Skip to content

Conversation

richard67
Copy link
Member

@richard67 richard67 commented Aug 5, 2025

Pull Request for Issue # .

Summary of Changes

This pull request (PR) updates the lists of files and folders to be deleted on update in script.php to the latest changes in the 6.0-dev branch.

The following deleted files are resulting from following PRs which were merged up from 5.4-dev:

The files of the first two PRs mentioned in the list above I had overlooked before the alpha3, so they were already removed in alpha3, that's why I add them to section // From 6.0.0-alpha2 to 6.0.0-alpha3 of the list of deleted files.

In addition, it adds deleted files and folders from following PRs for 6.0-dev:

  • [6.0] Convert Popular Module to Service #45808 file administrator/modules/mod_popular/mod_popular.php
  • [6.0] Removing Adapter and AdapterInstance classes #43794 folder libraries/src/Adapter with subfolders and files
  • [6.0] Remove CMS DB aware trait #45340 file libraries/src/MVC/Model/DatabaseAwareTrait.php
  • [6.0] update JOOMLA_MINIMUM_PHP #45746 folder libraries/vendor/symfony/polyfill-php83 with subfolders and files
  • [6.0] Updating dependencies #45827 folders libraries/vendor/doctrine/inflector/lib/Doctrine/Common,
    libraries/vendor/joomla/string/src/phputf8 and libraries/vendor/symfony/polyfill-php83
    with subfolders and files, and files
    libraries/vendor/joomla/database/src/Query/LimitableInterface.php,
    libraries/vendor/joomla/database/src/Query/PreparableInterface.php,
    libraries/vendor/laminas/laminas-diactoros/src/functions/create_uploaded_file.legacy.php,
    libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.legacy.php,
    libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.legacy.php,
    libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.legacy.php,
    libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.legacy.php,
    libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php,
    libraries/vendor/laminas/laminas-diactoros/src/functions/normalize_server.legacy.php,
    libraries/vendor/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.legacy.php,
    libraries/vendor/laminas/laminas-diactoros/src/functions/parse_cookie_header.legacy.php,
    libraries/vendor/laminas/laminas-diactoros/src/PhpInputStream.php,
    libraries/vendor/lcobucci/clock/renovate.json,
    libraries/vendor/symfony/http-client/Internal/AmpBody.php,
    libraries/vendor/symfony/http-client/Internal/AmpClientState.php,
    libraries/vendor/symfony/http-client/Internal/AmpListener.php,
    libraries/vendor/symfony/http-client/Internal/AmpResolver.php,
    libraries/vendor/symfony/http-client/Internal/LegacyHttplugInterface.php,
    libraries/vendor/symfony/http-client/Response/AmpResponse.php,
  • [6.0] Updating TinyMCE to 8.0.1 #45844 js and minified and gzipped js language files in folder
    media/vendor/tinymce/langs, and file media/vendor/tinymce/license.txt

Moreover, the following files were deleted from the list of deleted files as they were introduced back with PR #45827 :

  • libraries/vendor/algo26-matthias/idna-convert/src/NamePrep/CaseFolding.php
  • libraries/vendor/algo26-matthias/idna-convert/src/NamePrep/CaseFoldingData.php
  • libraries/vendor/algo26-matthias/idna-convert/src/NamePrep/CaseFoldingDataInterface.php

Finally, it adds the 2 new update SQL script from 5.4 as they shall not be present in 6.

Testing Instructions

Code review. Check the listed PRs for deleted files and verify that it matches the files being added by this PR to the list.

Or if you want to make a real test:

Update a 6.0.0-alpha3 to the latest 6.0 nightly build for the actual result, and update a 6.0.0-alpha3 to the patched update package or custom update URL created by drone for this PR for the expected result.

Actual result BEFORE applying this Pull Request

The files added by this PR to the list are still there after an update from 6.0.0-alpha3 to 6.0-dev nightly build, however they would not be there when making a new installation with that nightly build.

Expected result AFTER applying this Pull Request

The files added by this PR to the list are deleted after an update from 6.0.0-alpha3 to the patched package of this PR.

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

@richard67
Copy link
Member Author

Ping @Bodge-IT @softforge .

@richard67 richard67 changed the title [6.0] Update deleted files in script.php for the upcoming 6.0.0-beta1 [6.0] Update deleted files and folders in script.php for the upcoming 6.0.0-beta1 Aug 13, 2025
@richard67
Copy link
Member Author

@brianteeman Could you do a reqiew on this one? That would be really great.

And maybe @Hackwar could you also review as most of the stuff handled here comes from the composer and TinyMCE updates.

@brianteeman
Copy link
Contributor

Will do in the morning when I am back at my computer

@brianteeman
Copy link
Contributor

Not sure if I tested this correctly but I did an update from joomla 5.4 dev branch to this branch of joomla 6
I was a bit uncertain that it would work correctly but it would appear to all be ok


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/45849.

@brianteeman
Copy link
Contributor

I have tested this item ✅ successfully on 3cf880f


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/45849.

@wilsonge wilsonge merged commit c4eba01 into joomla:6.0-dev Aug 14, 2025
30 of 31 checks passed
@wilsonge wilsonge added this to the Joomla! 6.0.0 milestone Aug 14, 2025
@wilsonge
Copy link
Contributor

Getting this in so it's alongside the composer updates. Thanks!

@richard67 richard67 deleted the 6.0-dev-deleted-files-2025-07-28 branch August 14, 2025 08:01
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.

4 participants