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

Change wording from "merge" to "intersect" #5662

Merged
merged 1 commit into from Apr 28, 2021

Conversation

jschaedl
Copy link
Contributor

@jschaedl jschaedl commented Apr 26, 2021

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

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 (https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/44f7ac87dbd123edec69f26df670e2c475d0bad8/src/Console/ConfigurationResolver.php#L863) I thought it would be a good idea to change this here to make it more clear.
@keradus
Copy link
Member

keradus commented Apr 28, 2021

Thank you @jschaedl.

@keradus keradus merged commit 0e5b740 into PHP-CS-Fixer:2.18 Apr 28, 2021
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

2 participants