[4.2] Fix mistakes in lists of deleted files and folders in script.php #37826
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request for Issue # .
Summary of Changes
With the last merge from 4.1-dev to 4.2-dev, PR #37714 was not completely merged up.
The files which had been moved from the list of folders to the list of files have been added in the list of files but not removed in the list of folders.
Furthermore, with this commit, another files was added to the list of folders and not the list of files in 4.2-dev: 61c6f1f
This PR here corrects these mistakes and fixes code style so that the last element in an array is followed by a comma, which is one of our code style rules.
In addition, the version comment "// From 4.1.1 to 4.2.0" is changed to "// From 4.1 to 4.2.0" because that section does not depend on the patch version of 4.1, it applies to any 4.1.
Testing Instructions
Code review should be enough.
Actual result BEFORE applying this Pull Request
Files are in the list of folders to be deleted, and '/administrator/components/com_users/src/Field/PrimaryauthprovidersField.php' appears in both lists of files and folders.
Expected result AFTER applying this Pull Request
Files are in the list of files where they should be.
Documentation Changes Required
None.