Skip to content

Conversation

@richard67
Copy link
Member

@richard67 richard67 commented Feb 15, 2025

Pull Request for #44321 (comment) .

Summary of Changes

This pull request (PR) adds 2 folders to the list of folders not to be checked in the build/deleted_file_check.php script which is used to check if there are deleted files or folders to be added to the administrator/components/com_admin/script.php file.

The added folders belong to media files which were removed from the sources with PR #44321 but shall not be removed when updating, see #44321 (comment) .

Testing Instructions

The tests require PHP CLI so you can run PHP scripts on a command line, and it requires to be run on Linux or on Windows with WSL or on Mac OS. On Windows without WSL it does not work right. I will provide a fix for that sooner or later with another PR.

It is a stand-alone script and sop can be used even without the CMS.

  1. Download the latest 5.3 and 6.0 nightly build installation packages:
  1. Unzip the packages into separate folders, e.g. when using the tmp folder of your Git clone and the package file names as folder names:
  • ./tmp/Joomla_5.3.0-beta2-dev-Development-Full_Package
  • ./tmp/Joomla_6.0.0-alpha1-dev-Development-Full_Package
  1. Open a command window (Linux shell or Windows CMD) and change directory to the root folder of your Git clone.
  2. Run the following command to check the two folders from step 2 for deleted files and folders:
php ./build/deleted_file_check.php --from=./tmp/Joomla_5.3.0-beta2-dev-Development-Full_Package --to=./tmp/Joomla_6.0.0-alpha1-dev-Development-Full_Package
  1. Check the 2 created text files ./build/deleted_files.txt and ./build/deleted_folders.txt.
    Result: See section "Actual result BEFORE applying this Pull Request" below.
  2. Move the 2 text files from step 4 to somewhere outside the build folder for later comparison, e.g.:
mv ./build/deleted_files.txt ./tmp/deleted_files_without-pr.txt
mv ./build/deleted_folders.txt ./tmp/deleted_folders_without-pr.txt
  1. Apply the changes from this PR.
  2. Repeat steps 3 and 4 and compare the 2 text files with those saved in step 6.
    Result: See section "Expected result AFTER applying this Pull Request" below.

Actual result BEFORE applying this Pull Request

File ./build/deleted_files.txt includes the following files:

'/media/plg_captcha_recaptcha/js/recaptcha.js',
'/media/plg_captcha_recaptcha/js/recaptcha.min.js',
'/media/plg_captcha_recaptcha/js/recaptcha.min.js.gz',
'/media/plg_captcha_recaptcha_invisible/css/recaptcha_invisible.css',
'/media/plg_captcha_recaptcha_invisible/css/recaptcha_invisible.min.css',
'/media/plg_captcha_recaptcha_invisible/css/recaptcha_invisible.min.css.gz',
'/media/plg_captcha_recaptcha_invisible/js/recaptcha.js',
'/media/plg_captcha_recaptcha_invisible/js/recaptcha.min.js',
'/media/plg_captcha_recaptcha_invisible/js/recaptcha.min.js.gz',
'/media/plg_captcha_recaptcha_invisible/scss/recaptcha_invisible.scss',

File ./build/deleted_folders.txt includes the following folders:

'/media/plg_captcha_recaptcha_invisible/scss',
'/media/plg_captcha_recaptcha_invisible/js',
'/media/plg_captcha_recaptcha_invisible/css',
'/media/plg_captcha_recaptcha_invisible',
'/media/plg_captcha_recaptcha/js',
'/media/plg_captcha_recaptcha',

Besides this, there might be other files and folders in these text files which are not relevant for this PR here.

Expected result AFTER applying this Pull Request

Files ./build/deleted_files.txt and ./build/deleted_folders.txt do NOT include the files and folders mentioned in the previous section "Actual result BEFORE applying this Pull Request".

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 richard67 marked this pull request as ready for review February 15, 2025 20:17
@richard67 richard67 requested a review from rdeutz as a code owner February 15, 2025 20:17
@richard67
Copy link
Member Author

Hmm, there is something wrong. I have to check. Setting to draft in the mean time.

@richard67 richard67 marked this pull request as draft February 17, 2025 20:42
@richard67
Copy link
Member Author

Silly me, it was my testing instruction which was wrong. I've told to compare a 5.2-dev with a 5.3-dev package, but it should have been comparing a 5.3-dev with a 6.0-dev package. Fixed it.

@richard67 richard67 marked this pull request as ready for review February 19, 2025 14:09
@Bodge-IT Bodge-IT merged commit 95be2c1 into joomla:6.0-dev Mar 3, 2025
3 checks passed
@richard67 richard67 deleted the 6.0-dev-deleted-files-check-exceptions-pr-44321 branch March 3, 2025 22:40
@LadySolveig LadySolveig added this to the Joomla! 6.0.0 milestone Mar 19, 2025
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