Change wording from "merge" to "intersect" #5662
Merged
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.
Since using the
--path-mode=intersection
does not merge the paths in the config file and the paths provided by the command argument and is instead intersecting both, I thought it would be a good idea to change this here to make it more clear.https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/44f7ac87dbd123edec69f26df670e2c475d0bad8/src/Console/ConfigurationResolver.php#L863