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.0] Remove libraries/vendor/psr/http-message/docs from deleted files and folders lists in script.php #40752

Merged
merged 2 commits into from
Jun 11, 2023

Conversation

richard67
Copy link
Member

@richard67 richard67 commented Jun 11, 2023

Pull Request for Issue # .

Summary of Changes

This pull request (PR) removes the following items from the lists of files and folders to be deleted on update in script.php:

  • Files /libraries/vendor/psr/http-message/docs/PSR7-Interfaces.md and /libraries/vendor/psr/http-message/docs/PSR7-Usage.md.
  • Folder /libraries/vendor/psr/http-message/docs.

The reason why they have been added to the lists before is because these files were present in 4.4-dev full installation packages but not in 5.0-dev full installation packages at the time when the alpha1 releases were prepared.

Meanwhile the files are also present in 5.0-dev full installation packages, so they have to be removed from the lists of files and folders to be deleted on update.

Request for Comments

Alternatively to this PR or in addition to it, these files and the folder could be removed from building the packages like we do with other build or documentation files from composer or npm dependencies e.g. here: https://github.com/joomla/joomla-cms/blob/5.0-dev/build/build.php#L125-L192 , because they are only documentation of a composer dependency.

But they are end user documentation and not documentation for maintenance of that library, so maybe they should be kept?

Anyway, if we decide to remove them from the build, this should be done in 4.4-dev and later be merged up to 5.0-dev so that is done in both versions.

I still would say merge this PR so they are removed from the lists of deleted files and folders, and later when they have been removed from the package build in both versions, they will be added back to these lists but at a later section with the correct version comment "// From 5.0.0-alpha1 to 5.0.0-alpha2".

But it also would be ok not to merge this PR here and leave it as it is when the other thing (build.php) is done in 4.4-dev and merged up to 5.0-dev before the next alpha2 releases.

@HLeithner Please check and if necessary discuss with others and decide.

Testing Instructions

Code review plus check if the files and their parent folder mentioned in the description above are present in following full installation packages:

Actual result BEFORE applying this Pull Request

The files and their parent folder are present in the 4.4.0-alpha1 package and in the latest 5.0.0-alpha2-dev nightly build.

In the 5.0.0-alpha1 package they are not present, that's why they were added to the lists of deleted files and folders.

When updating from 4.4 to 5 or from 5.x to 5.y the files and their parent folder will be deleted.

Expected result AFTER applying this Pull Request

When updating from 4.4 to 5 or from 5.x to 5.y the files and their parent folder will not be deleted.

Link to documentations

Please select:

  • No documentation changes for docs.joomla.org needed

  • No documentation changes for manual.joomla.org needed

@HLeithner HLeithner merged commit 0edc598 into joomla:5.0-dev Jun 11, 2023
3 checks passed
@HLeithner
Copy link
Member

thanks

@richard67 richard67 deleted the 5.0-dev-deleted-files-2023-06-08 branch June 11, 2023 15:28
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 23, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 3, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 22, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 23, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Aug 12, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Aug 19, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 1, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 4, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 4, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 4, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 5, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 14, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 19, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Oct 1, 2023
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