Merge branch '2.7' into 2.8

fabpot · fabpot · commit 71046fda52db · 2016-06-29T07:29:29.000+02:00
* 2.7: removed dots at the end of @param and @return fixed typo
diff --git a/Iterator/PathFilterIterator.php b/Iterator/PathFilterIterator.php
@@ -45,7 +45,7 @@ public function accept()
      *
      * Use only / as directory separator (on Windows also).
      *
-     * @param string $str Pattern: regexp or dirname.
+     * @param string $str Pattern: regexp or dirname
      *
      * @return string regexp corresponding to a given string or regexp
      */

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function accept()`
`45`	`45`	`*`
`46`	`46`	`* Use only / as directory separator (on Windows also).`
`47`	`47`	`*`
`48`		`- * @param string $str Pattern: regexp or dirname.`
	`48`	`+ * @param string $str Pattern: regexp or dirname`
`49`	`49`	`*`
`50`	`50`	`* @return string regexp corresponding to a given string or regexp`
`51`	`51`	`*/`