Merge branch '2.7' into 2.8

fabpot · fabpot · commit c5c751ccd502 · 2018-03-05T10:27:59.000-08:00
* 2.7:
  Improve the documentation of `Finder::exclude()`
diff --git a/Finder.php b/Finder.php
@@ -407,6 +407,10 @@ public function size($size)
     /**
      * Excludes directories.
      *
+     * Directories passed as argument must be relative to the ones defined with the `in()` method. For example:
+     *
+     *     $finder->in(__DIR__)->exclude('ruby');
+     *
      * @param string|array $dirs A directory path or an array of directories
      *
      * @return $this

Original file line number	Diff line number	Diff line change
`@@ -407,6 +407,10 @@ public function size($size)`
`407`	`407`	`/**`
`408`	`408`	`* Excludes directories.`
`409`	`409`	`*`
	`410`	+ * Directories passed as argument must be relative to the ones defined with the `in()` method. For example:
	`411`	`+ *`
	`412`	`+ * $finder->in(__DIR__)->exclude('ruby');`
	`413`	`+ *`
`410`	`414`	`* @param string\|array $dirs A directory path or an array of directories`
`411`	`415`	`*`
`412`	`416`	`* @return $this`