Skip to content

Commit

Permalink
minor #5662 Change wording from "merge" to "intersect" (jschaedl)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.18 branch.

Discussion
----------

Change wording from "merge" to "intersect"

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

Commits
-------

5cc310d Change wording from "merge" to "intersect"
  • Loading branch information
keradus committed Apr 28, 2021
2 parents 8054f4c + 5cc310d commit 0e5b740
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/usage.rst
Expand Up @@ -11,8 +11,8 @@ problems as possible on a given file or files in a given directory and its subdi
$ php php-cs-fixer.phar fix /path/to/file
By default ``--path-mode`` is set to ``override``, which means, that if you specify the path to a file or a directory via
command arguments, then the paths provided to a ``Finder`` in config file will be ignored. You can use ``--path-mode=intersection``
to merge paths from the config file and from the argument:
command arguments, then the paths provided to a ``Finder`` in config file will be ignored. You can also use ``--path-mode=intersection``,
which will use the intersection of the paths from the config file and from the argument:

.. code-block:: console
Expand Down

0 comments on commit 0e5b740

Please sign in to comment.