Merge branch '3.1' into 3.2

fabpot · fabpot · commit 1c194fa21aa8 · 2016-12-27T11:44:30.000+01:00
* 3.1: fixed @return when returning this or static override property constraints in child class removed unneeded comment [Console] improved code coverage of Command class [FrameworkBundle] Make TemplateController working without the Templating component Only count on arrays or countables to avoid warnings in PHP 7.2
diff --git a/Finder.php b/Finder.php
@@ -72,7 +72,7 @@ public function __construct()
     /**
      * Creates a new Finder.
      *
-     * @return Finder A new Finder instance
+     * @return static
      */
     public static function create()
     {
@@ -82,7 +82,7 @@ public static function create()
     /**
      * Restricts the matching to directories only.
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      */
     public function directories()
     {
@@ -94,7 +94,7 @@ public function directories()
     /**
      * Restricts the matching to files only.
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      */
     public function files()
     {
@@ -113,7 +113,7 @@ public function files()
      *
      * @param string|int $level The depth level expression
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see DepthRangeFilterIterator
      * @see NumberComparator
@@ -137,7 +137,7 @@ public function depth($level)
      *
      * @param string $date A date range string
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see strtotime
      * @see DateRangeFilterIterator
@@ -161,7 +161,7 @@ public function date($date)
      *
      * @param string $pattern A pattern (a regexp, a glob, or a string)
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see FilenameFilterIterator
      */
@@ -177,7 +177,7 @@ public function name($pattern)
      *
      * @param string $pattern A pattern (a regexp, a glob, or a string)
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see FilenameFilterIterator
      */
@@ -198,7 +198,7 @@ public function notName($pattern)
      *
      * @param string $pattern A pattern (string or regexp)
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see FilecontentFilterIterator
      */
@@ -219,7 +219,7 @@ public function contains($pattern)
      *
      * @param string $pattern A pattern (string or regexp)
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see FilecontentFilterIterator
      */
@@ -242,7 +242,7 @@ public function notContains($pattern)
      *
      * @param string $pattern A pattern (a regexp or a string)
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see FilenameFilterIterator
      */
@@ -265,7 +265,7 @@ public function path($pattern)
      *
      * @param string $pattern A pattern (a regexp or a string)
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see FilenameFilterIterator
      */
@@ -285,7 +285,7 @@ public function notPath($pattern)
      *
      * @param string|int $size A size range string or an integer
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see SizeRangeFilterIterator
      * @see NumberComparator
@@ -302,7 +302,7 @@ public function size($size)
      *
      * @param string|array $dirs A directory path or an array of directories
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see ExcludeDirectoryFilterIterator
      */
@@ -318,7 +318,7 @@ public function exclude($dirs)
      *
      * @param bool $ignoreDotFiles Whether to exclude "hidden" files or not
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see ExcludeDirectoryFilterIterator
      */
@@ -338,7 +338,7 @@ public function ignoreDotFiles($ignoreDotFiles)
      *
      * @param bool $ignoreVCS Whether to exclude VCS files or not
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see ExcludeDirectoryFilterIterator
      */
@@ -378,7 +378,7 @@ public static function addVCSPattern($pattern)
      *
      * @param \Closure $closure An anonymous function
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see SortableIterator
      */
@@ -394,7 +394,7 @@ public function sort(\Closure $closure)
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see SortableIterator
      */
@@ -410,7 +410,7 @@ public function sortByName()
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see SortableIterator
      */
@@ -428,7 +428,7 @@ public function sortByType()
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see SortableIterator
      */
@@ -448,7 +448,7 @@ public function sortByAccessedTime()
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see SortableIterator
      */
@@ -466,7 +466,7 @@ public function sortByChangedTime()
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see SortableIterator
      */
@@ -485,7 +485,7 @@ public function sortByModifiedTime()
      *
      * @param \Closure $closure An anonymous function
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @see CustomFilterIterator
      */
@@ -499,7 +499,7 @@ public function filter(\Closure $closure)
     /**
      * Forces the following of symlinks.
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      */
     public function followLinks()
     {
@@ -515,7 +515,7 @@ public function followLinks()
      *
      * @param bool $ignore
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      */
     public function ignoreUnreadableDirs($ignore = true)
     {
@@ -529,7 +529,7 @@ public function ignoreUnreadableDirs($ignore = true)
      *
      * @param string|array $dirs A directory path or an array of directories
      *
-     * @return Finder|SplFileInfo[] The current Finder instance
+     * @return $this
      *
      * @throws \InvalidArgumentException if one of the directories does not exist
      */
@@ -590,7 +590,7 @@ public function getIterator()
      *
      * @param mixed $iterator
      *
-     * @return Finder|SplFileInfo[] The finder
+     * @return $this
      *
      * @throws \InvalidArgumentException When the given argument is not iterable.
      */

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function __construct()`
`72`	`72`	`/**`
`73`	`73`	`* Creates a new Finder.`
`74`	`74`	`*`
`75`		`- * @return Finder A new Finder instance`
	`75`	`+ * @return static`
`76`	`76`	`*/`
`77`	`77`	`public static function create()`
`78`	`78`	`{`
`@@ -82,7 +82,7 @@ public static function create()`
`82`	`82`	`/**`
`83`	`83`	`* Restricts the matching to directories only.`
`84`	`84`	`*`
`85`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`85`	`+ * @return $this`
`86`	`86`	`*/`
`87`	`87`	`public function directories()`
`88`	`88`	`{`
`@@ -94,7 +94,7 @@ public function directories()`
`94`	`94`	`/**`
`95`	`95`	`* Restricts the matching to files only.`
`96`	`96`	`*`
`97`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`97`	`+ * @return $this`
`98`	`98`	`*/`
`99`	`99`	`public function files()`
`100`	`100`	`{`
`@@ -113,7 +113,7 @@ public function files()`
`113`	`113`	`*`
`114`	`114`	`* @param string\|int $level The depth level expression`
`115`	`115`	`*`
`116`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`116`	`+ * @return $this`
`117`	`117`	`*`
`118`	`118`	`* @see DepthRangeFilterIterator`
`119`	`119`	`* @see NumberComparator`
`@@ -137,7 +137,7 @@ public function depth($level)`
`137`	`137`	`*`
`138`	`138`	`* @param string $date A date range string`
`139`	`139`	`*`
`140`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`140`	`+ * @return $this`
`141`	`141`	`*`
`142`	`142`	`* @see strtotime`
`143`	`143`	`* @see DateRangeFilterIterator`
`@@ -161,7 +161,7 @@ public function date($date)`
`161`	`161`	`*`
`162`	`162`	`* @param string $pattern A pattern (a regexp, a glob, or a string)`
`163`	`163`	`*`
`164`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`164`	`+ * @return $this`
`165`	`165`	`*`
`166`	`166`	`* @see FilenameFilterIterator`
`167`	`167`	`*/`
`@@ -177,7 +177,7 @@ public function name($pattern)`
`177`	`177`	`*`
`178`	`178`	`* @param string $pattern A pattern (a regexp, a glob, or a string)`
`179`	`179`	`*`
`180`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`180`	`+ * @return $this`
`181`	`181`	`*`
`182`	`182`	`* @see FilenameFilterIterator`
`183`	`183`	`*/`
`@@ -198,7 +198,7 @@ public function notName($pattern)`
`198`	`198`	`*`
`199`	`199`	`* @param string $pattern A pattern (string or regexp)`
`200`	`200`	`*`
`201`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`201`	`+ * @return $this`
`202`	`202`	`*`
`203`	`203`	`* @see FilecontentFilterIterator`
`204`	`204`	`*/`
`@@ -219,7 +219,7 @@ public function contains($pattern)`
`219`	`219`	`*`
`220`	`220`	`* @param string $pattern A pattern (string or regexp)`
`221`	`221`	`*`
`222`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`222`	`+ * @return $this`
`223`	`223`	`*`
`224`	`224`	`* @see FilecontentFilterIterator`
`225`	`225`	`*/`
`@@ -242,7 +242,7 @@ public function notContains($pattern)`
`242`	`242`	`*`
`243`	`243`	`* @param string $pattern A pattern (a regexp or a string)`
`244`	`244`	`*`
`245`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`245`	`+ * @return $this`
`246`	`246`	`*`
`247`	`247`	`* @see FilenameFilterIterator`
`248`	`248`	`*/`
`@@ -265,7 +265,7 @@ public function path($pattern)`
`265`	`265`	`*`
`266`	`266`	`* @param string $pattern A pattern (a regexp or a string)`
`267`	`267`	`*`
`268`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`268`	`+ * @return $this`
`269`	`269`	`*`
`270`	`270`	`* @see FilenameFilterIterator`
`271`	`271`	`*/`
`@@ -285,7 +285,7 @@ public function notPath($pattern)`
`285`	`285`	`*`
`286`	`286`	`* @param string\|int $size A size range string or an integer`
`287`	`287`	`*`
`288`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`288`	`+ * @return $this`
`289`	`289`	`*`
`290`	`290`	`* @see SizeRangeFilterIterator`
`291`	`291`	`* @see NumberComparator`
`@@ -302,7 +302,7 @@ public function size($size)`
`302`	`302`	`*`
`303`	`303`	`* @param string\|array $dirs A directory path or an array of directories`
`304`	`304`	`*`
`305`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`305`	`+ * @return $this`
`306`	`306`	`*`
`307`	`307`	`* @see ExcludeDirectoryFilterIterator`
`308`	`308`	`*/`
`@@ -318,7 +318,7 @@ public function exclude($dirs)`
`318`	`318`	`*`
`319`	`319`	`* @param bool $ignoreDotFiles Whether to exclude "hidden" files or not`
`320`	`320`	`*`
`321`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`321`	`+ * @return $this`
`322`	`322`	`*`
`323`	`323`	`* @see ExcludeDirectoryFilterIterator`
`324`	`324`	`*/`
`@@ -338,7 +338,7 @@ public function ignoreDotFiles($ignoreDotFiles)`
`338`	`338`	`*`
`339`	`339`	`* @param bool $ignoreVCS Whether to exclude VCS files or not`
`340`	`340`	`*`
`341`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`341`	`+ * @return $this`
`342`	`342`	`*`
`343`	`343`	`* @see ExcludeDirectoryFilterIterator`
`344`	`344`	`*/`
`@@ -378,7 +378,7 @@ public static function addVCSPattern($pattern)`
`378`	`378`	`*`
`379`	`379`	`* @param \Closure $closure An anonymous function`
`380`	`380`	`*`
`381`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`381`	`+ * @return $this`
`382`	`382`	`*`
`383`	`383`	`* @see SortableIterator`
`384`	`384`	`*/`
`@@ -394,7 +394,7 @@ public function sort(\Closure $closure)`
`394`	`394`	`*`
`395`	`395`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`396`	`396`	`*`
`397`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`397`	`+ * @return $this`
`398`	`398`	`*`
`399`	`399`	`* @see SortableIterator`
`400`	`400`	`*/`
`@@ -410,7 +410,7 @@ public function sortByName()`
`410`	`410`	`*`
`411`	`411`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`412`	`412`	`*`
`413`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`413`	`+ * @return $this`
`414`	`414`	`*`
`415`	`415`	`* @see SortableIterator`
`416`	`416`	`*/`
`@@ -428,7 +428,7 @@ public function sortByType()`
`428`	`428`	`*`
`429`	`429`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`430`	`430`	`*`
`431`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`431`	`+ * @return $this`
`432`	`432`	`*`
`433`	`433`	`* @see SortableIterator`
`434`	`434`	`*/`
`@@ -448,7 +448,7 @@ public function sortByAccessedTime()`
`448`	`448`	`*`
`449`	`449`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`450`	`450`	`*`
`451`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`451`	`+ * @return $this`
`452`	`452`	`*`
`453`	`453`	`* @see SortableIterator`
`454`	`454`	`*/`
`@@ -466,7 +466,7 @@ public function sortByChangedTime()`
`466`	`466`	`*`
`467`	`467`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`468`	`468`	`*`
`469`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`469`	`+ * @return $this`
`470`	`470`	`*`
`471`	`471`	`* @see SortableIterator`
`472`	`472`	`*/`
`@@ -485,7 +485,7 @@ public function sortByModifiedTime()`
`485`	`485`	`*`
`486`	`486`	`* @param \Closure $closure An anonymous function`
`487`	`487`	`*`
`488`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`488`	`+ * @return $this`
`489`	`489`	`*`
`490`	`490`	`* @see CustomFilterIterator`
`491`	`491`	`*/`
`@@ -499,7 +499,7 @@ public function filter(\Closure $closure)`
`499`	`499`	`/**`
`500`	`500`	`* Forces the following of symlinks.`
`501`	`501`	`*`
`502`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`502`	`+ * @return $this`
`503`	`503`	`*/`
`504`	`504`	`public function followLinks()`
`505`	`505`	`{`
`@@ -515,7 +515,7 @@ public function followLinks()`
`515`	`515`	`*`
`516`	`516`	`* @param bool $ignore`
`517`	`517`	`*`
`518`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`518`	`+ * @return $this`
`519`	`519`	`*/`
`520`	`520`	`public function ignoreUnreadableDirs($ignore = true)`
`521`	`521`	`{`
`@@ -529,7 +529,7 @@ public function ignoreUnreadableDirs($ignore = true)`
`529`	`529`	`*`
`530`	`530`	`* @param string\|array $dirs A directory path or an array of directories`
`531`	`531`	`*`
`532`		`- * @return Finder\|SplFileInfo[] The current Finder instance`
	`532`	`+ * @return $this`
`533`	`533`	`*`
`534`	`534`	`* @throws \InvalidArgumentException if one of the directories does not exist`
`535`	`535`	`*/`
`@@ -590,7 +590,7 @@ public function getIterator()`
`590`	`590`	`*`
`591`	`591`	`* @param mixed $iterator`
`592`	`592`	`*`
`593`		`- * @return Finder\|SplFileInfo[] The finder`
	`593`	`+ * @return $this`
`594`	`594`	`*`
`595`	`595`	`* @throws \InvalidArgumentException When the given argument is not iterable.`
`596`	`596`	`*/`