Merge branch '3.4' into 4.0

fabpot · fabpot · commit 44a796d2ecc2 · 2018-03-05T10:28:26.000-08:00
* 3.4:
  Improve the documentation of `Finder::exclude()`
  [DI] Skip resource tracking if disabled
  [WebProfilerBundle] fix wrong variable for profiler counting ajax requests
diff --git a/Finder.php b/Finder.php
@@ -297,6 +297,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
`@@ -297,6 +297,10 @@ public function size($size)`
`297`	`297`	`/**`
`298`	`298`	`* Excludes directories.`
`299`	`299`	`*`
	`300`	+ * Directories passed as argument must be relative to the ones defined with the `in()` method. For example:
	`301`	`+ *`
	`302`	`+ * $finder->in(__DIR__)->exclude('ruby');`
	`303`	`+ *`
`300`	`304`	`* @param string\|array $dirs A directory path or an array of directories`
`301`	`305`	`*`
`302`	`306`	`* @return $this`