Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 6a615613745c · 2018-02-11T18:15:12.000+01:00
* 2.8:
  [Bridge\PhpUnit] Exit as late as possible
  Update Repository Symlink Helper
  Document explicitly that dotfiles and vcs files are ignored by default
  do not mock the container builder in tests
diff --git a/Finder.php b/Finder.php
@@ -313,6 +313,8 @@ public function exclude($dirs)
     /**
      * Excludes "hidden" directories and files (starting with a dot).
      *
+     * This option is enabled by default.
+     *
      * @param bool $ignoreDotFiles Whether to exclude "hidden" files or not
      *
      * @return $this
@@ -333,6 +335,8 @@ public function ignoreDotFiles($ignoreDotFiles)
     /**
      * Forces the finder to ignore version control directories.
      *
+     * This option is enabled by default.
+     *
      * @param bool $ignoreVCS Whether to exclude VCS files or not
      *
      * @return $this

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,8 @@ public function exclude($dirs)`
`313`	`313`	`/**`
`314`	`314`	`* Excludes "hidden" directories and files (starting with a dot).`
`315`	`315`	`*`
	`316`	`+ * This option is enabled by default.`
	`317`	`+ *`
`316`	`318`	`* @param bool $ignoreDotFiles Whether to exclude "hidden" files or not`
`317`	`319`	`*`
`318`	`320`	`* @return $this`
`@@ -333,6 +335,8 @@ public function ignoreDotFiles($ignoreDotFiles)`
`333`	`335`	`/**`
`334`	`336`	`* Forces the finder to ignore version control directories.`
`335`	`337`	`*`
	`338`	`+ * This option is enabled by default.`
	`339`	`+ *`
`336`	`340`	`* @param bool $ignoreVCS Whether to exclude VCS files or not`
`337`	`341`	`*`
`338`	`342`	`* @return $this`