Merge branch '2.7' into 2.8

fabpot · fabpot · commit 830e9945800e · 2016-05-13T10:38:45.000-05:00
* 2.7:
  added missing constant in Response
  Update HTTP statuses list
  [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
  added StaticVerionStrategyTest
  Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
  [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  Updated the link to the list of currency codes
  [console][table] adjust width of colspanned cell.
diff --git a/Finder.php b/Finder.php
@@ -192,7 +192,7 @@ public function getAdapters()
     /**
      * Restricts the matching to directories only.
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      */
     public function directories()
     {
@@ -204,7 +204,7 @@ public function directories()
     /**
      * Restricts the matching to files only.
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      */
     public function files()
     {
@@ -223,7 +223,7 @@ public function files()
      *
      * @param int $level The depth level expression
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see DepthRangeFilterIterator
      * @see NumberComparator
@@ -247,7 +247,7 @@ public function depth($level)
      *
      * @param string $date A date range string
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see strtotime
      * @see DateRangeFilterIterator
@@ -271,7 +271,7 @@ public function date($date)
      *
      * @param string $pattern A pattern (a regexp, a glob, or a string)
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see FilenameFilterIterator
      */
@@ -287,7 +287,7 @@ public function name($pattern)
      *
      * @param string $pattern A pattern (a regexp, a glob, or a string)
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see FilenameFilterIterator
      */
@@ -308,7 +308,7 @@ public function notName($pattern)
      *
      * @param string $pattern A pattern (string or regexp)
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see FilecontentFilterIterator
      */
@@ -329,7 +329,7 @@ public function contains($pattern)
      *
      * @param string $pattern A pattern (string or regexp)
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see FilecontentFilterIterator
      */
@@ -352,7 +352,7 @@ public function notContains($pattern)
      *
      * @param string $pattern A pattern (a regexp or a string)
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see FilenameFilterIterator
      */
@@ -375,7 +375,7 @@ public function path($pattern)
      *
      * @param string $pattern A pattern (a regexp or a string)
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see FilenameFilterIterator
      */
@@ -395,7 +395,7 @@ public function notPath($pattern)
      *
      * @param string $size A size range string
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see SizeRangeFilterIterator
      * @see NumberComparator
@@ -412,7 +412,7 @@ public function size($size)
      *
      * @param string|array $dirs A directory path or an array of directories
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see ExcludeDirectoryFilterIterator
      */
@@ -428,7 +428,7 @@ public function exclude($dirs)
      *
      * @param bool $ignoreDotFiles Whether to exclude "hidden" files or not
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see ExcludeDirectoryFilterIterator
      */
@@ -448,7 +448,7 @@ public function ignoreDotFiles($ignoreDotFiles)
      *
      * @param bool $ignoreVCS Whether to exclude VCS files or not
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see ExcludeDirectoryFilterIterator
      */
@@ -488,7 +488,7 @@ public static function addVCSPattern($pattern)
      *
      * @param \Closure $closure An anonymous function
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see SortableIterator
      */
@@ -504,7 +504,7 @@ public function sort(\Closure $closure)
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see SortableIterator
      */
@@ -520,7 +520,7 @@ public function sortByName()
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see SortableIterator
      */
@@ -538,7 +538,7 @@ public function sortByType()
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see SortableIterator
      */
@@ -558,7 +558,7 @@ public function sortByAccessedTime()
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see SortableIterator
      */
@@ -576,7 +576,7 @@ public function sortByChangedTime()
      *
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see SortableIterator
      */
@@ -595,7 +595,7 @@ public function sortByModifiedTime()
      *
      * @param \Closure $closure An anonymous function
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @see CustomFilterIterator
      */
@@ -609,7 +609,7 @@ public function filter(\Closure $closure)
     /**
      * Forces the following of symlinks.
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      */
     public function followLinks()
     {
@@ -625,7 +625,7 @@ public function followLinks()
      *
      * @param bool $ignore
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      */
     public function ignoreUnreadableDirs($ignore = true)
     {
@@ -639,7 +639,7 @@ public function ignoreUnreadableDirs($ignore = true)
      *
      * @param string|array $dirs A directory path or an array of directories
      *
-     * @return Finder The current Finder instance
+     * @return Finder|SplFileInfo[] The current Finder instance
      *
      * @throws \InvalidArgumentException if one of the directories does not exist
      */
@@ -700,7 +700,7 @@ public function getIterator()
      *
      * @param mixed $iterator
      *
-     * @return Finder The finder
+     * @return Finder|SplFileInfo[] The finder
      *
      * @throws \InvalidArgumentException When the given argument is not iterable.
      */

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public function getAdapters()`
`192`	`192`	`/**`
`193`	`193`	`* Restricts the matching to directories only.`
`194`	`194`	`*`
`195`		`- * @return Finder The current Finder instance`
	`195`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`196`	`196`	`*/`
`197`	`197`	`public function directories()`
`198`	`198`	`{`
`@@ -204,7 +204,7 @@ public function directories()`
`204`	`204`	`/**`
`205`	`205`	`* Restricts the matching to files only.`
`206`	`206`	`*`
`207`		`- * @return Finder The current Finder instance`
	`207`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`208`	`208`	`*/`
`209`	`209`	`public function files()`
`210`	`210`	`{`
`@@ -223,7 +223,7 @@ public function files()`
`223`	`223`	`*`
`224`	`224`	`* @param int $level The depth level expression`
`225`	`225`	`*`
`226`		`- * @return Finder The current Finder instance`
	`226`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`227`	`227`	`*`
`228`	`228`	`* @see DepthRangeFilterIterator`
`229`	`229`	`* @see NumberComparator`
`@@ -247,7 +247,7 @@ public function depth($level)`
`247`	`247`	`*`
`248`	`248`	`* @param string $date A date range string`
`249`	`249`	`*`
`250`		`- * @return Finder The current Finder instance`
	`250`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`251`	`251`	`*`
`252`	`252`	`* @see strtotime`
`253`	`253`	`* @see DateRangeFilterIterator`
`@@ -271,7 +271,7 @@ public function date($date)`
`271`	`271`	`*`
`272`	`272`	`* @param string $pattern A pattern (a regexp, a glob, or a string)`
`273`	`273`	`*`
`274`		`- * @return Finder The current Finder instance`
	`274`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`275`	`275`	`*`
`276`	`276`	`* @see FilenameFilterIterator`
`277`	`277`	`*/`
`@@ -287,7 +287,7 @@ public function name($pattern)`
`287`	`287`	`*`
`288`	`288`	`* @param string $pattern A pattern (a regexp, a glob, or a string)`
`289`	`289`	`*`
`290`		`- * @return Finder The current Finder instance`
	`290`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`291`	`291`	`*`
`292`	`292`	`* @see FilenameFilterIterator`
`293`	`293`	`*/`
`@@ -308,7 +308,7 @@ public function notName($pattern)`
`308`	`308`	`*`
`309`	`309`	`* @param string $pattern A pattern (string or regexp)`
`310`	`310`	`*`
`311`		`- * @return Finder The current Finder instance`
	`311`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`312`	`312`	`*`
`313`	`313`	`* @see FilecontentFilterIterator`
`314`	`314`	`*/`
`@@ -329,7 +329,7 @@ public function contains($pattern)`
`329`	`329`	`*`
`330`	`330`	`* @param string $pattern A pattern (string or regexp)`
`331`	`331`	`*`
`332`		`- * @return Finder The current Finder instance`
	`332`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`333`	`333`	`*`
`334`	`334`	`* @see FilecontentFilterIterator`
`335`	`335`	`*/`
`@@ -352,7 +352,7 @@ public function notContains($pattern)`
`352`	`352`	`*`
`353`	`353`	`* @param string $pattern A pattern (a regexp or a string)`
`354`	`354`	`*`
`355`		`- * @return Finder The current Finder instance`
	`355`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`356`	`356`	`*`
`357`	`357`	`* @see FilenameFilterIterator`
`358`	`358`	`*/`
`@@ -375,7 +375,7 @@ public function path($pattern)`
`375`	`375`	`*`
`376`	`376`	`* @param string $pattern A pattern (a regexp or a string)`
`377`	`377`	`*`
`378`		`- * @return Finder The current Finder instance`
	`378`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`379`	`379`	`*`
`380`	`380`	`* @see FilenameFilterIterator`
`381`	`381`	`*/`
`@@ -395,7 +395,7 @@ public function notPath($pattern)`
`395`	`395`	`*`
`396`	`396`	`* @param string $size A size range string`
`397`	`397`	`*`
`398`		`- * @return Finder The current Finder instance`
	`398`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`399`	`399`	`*`
`400`	`400`	`* @see SizeRangeFilterIterator`
`401`	`401`	`* @see NumberComparator`
`@@ -412,7 +412,7 @@ public function size($size)`
`412`	`412`	`*`
`413`	`413`	`* @param string\|array $dirs A directory path or an array of directories`
`414`	`414`	`*`
`415`		`- * @return Finder The current Finder instance`
	`415`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`416`	`416`	`*`
`417`	`417`	`* @see ExcludeDirectoryFilterIterator`
`418`	`418`	`*/`
`@@ -428,7 +428,7 @@ public function exclude($dirs)`
`428`	`428`	`*`
`429`	`429`	`* @param bool $ignoreDotFiles Whether to exclude "hidden" files or not`
`430`	`430`	`*`
`431`		`- * @return Finder The current Finder instance`
	`431`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`432`	`432`	`*`
`433`	`433`	`* @see ExcludeDirectoryFilterIterator`
`434`	`434`	`*/`
`@@ -448,7 +448,7 @@ public function ignoreDotFiles($ignoreDotFiles)`
`448`	`448`	`*`
`449`	`449`	`* @param bool $ignoreVCS Whether to exclude VCS files or not`
`450`	`450`	`*`
`451`		`- * @return Finder The current Finder instance`
	`451`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`452`	`452`	`*`
`453`	`453`	`* @see ExcludeDirectoryFilterIterator`
`454`	`454`	`*/`
`@@ -488,7 +488,7 @@ public static function addVCSPattern($pattern)`
`488`	`488`	`*`
`489`	`489`	`* @param \Closure $closure An anonymous function`
`490`	`490`	`*`
`491`		`- * @return Finder The current Finder instance`
	`491`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`492`	`492`	`*`
`493`	`493`	`* @see SortableIterator`
`494`	`494`	`*/`
`@@ -504,7 +504,7 @@ public function sort(\Closure $closure)`
`504`	`504`	`*`
`505`	`505`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`506`	`506`	`*`
`507`		`- * @return Finder The current Finder instance`
	`507`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`508`	`508`	`*`
`509`	`509`	`* @see SortableIterator`
`510`	`510`	`*/`
`@@ -520,7 +520,7 @@ public function sortByName()`
`520`	`520`	`*`
`521`	`521`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`522`	`522`	`*`
`523`		`- * @return Finder The current Finder instance`
	`523`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`524`	`524`	`*`
`525`	`525`	`* @see SortableIterator`
`526`	`526`	`*/`
`@@ -538,7 +538,7 @@ public function sortByType()`
`538`	`538`	`*`
`539`	`539`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`540`	`540`	`*`
`541`		`- * @return Finder The current Finder instance`
	`541`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`542`	`542`	`*`
`543`	`543`	`* @see SortableIterator`
`544`	`544`	`*/`
`@@ -558,7 +558,7 @@ public function sortByAccessedTime()`
`558`	`558`	`*`
`559`	`559`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`560`	`560`	`*`
`561`		`- * @return Finder The current Finder instance`
	`561`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`562`	`562`	`*`
`563`	`563`	`* @see SortableIterator`
`564`	`564`	`*/`
`@@ -576,7 +576,7 @@ public function sortByChangedTime()`
`576`	`576`	`*`
`577`	`577`	`* This can be slow as all the matching files and directories must be retrieved for comparison.`
`578`	`578`	`*`
`579`		`- * @return Finder The current Finder instance`
	`579`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`580`	`580`	`*`
`581`	`581`	`* @see SortableIterator`
`582`	`582`	`*/`
`@@ -595,7 +595,7 @@ public function sortByModifiedTime()`
`595`	`595`	`*`
`596`	`596`	`* @param \Closure $closure An anonymous function`
`597`	`597`	`*`
`598`		`- * @return Finder The current Finder instance`
	`598`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`599`	`599`	`*`
`600`	`600`	`* @see CustomFilterIterator`
`601`	`601`	`*/`
`@@ -609,7 +609,7 @@ public function filter(\Closure $closure)`
`609`	`609`	`/**`
`610`	`610`	`* Forces the following of symlinks.`
`611`	`611`	`*`
`612`		`- * @return Finder The current Finder instance`
	`612`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`613`	`613`	`*/`
`614`	`614`	`public function followLinks()`
`615`	`615`	`{`
`@@ -625,7 +625,7 @@ public function followLinks()`
`625`	`625`	`*`
`626`	`626`	`* @param bool $ignore`
`627`	`627`	`*`
`628`		`- * @return Finder The current Finder instance`
	`628`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`629`	`629`	`*/`
`630`	`630`	`public function ignoreUnreadableDirs($ignore = true)`
`631`	`631`	`{`
`@@ -639,7 +639,7 @@ public function ignoreUnreadableDirs($ignore = true)`
`639`	`639`	`*`
`640`	`640`	`* @param string\|array $dirs A directory path or an array of directories`
`641`	`641`	`*`
`642`		`- * @return Finder The current Finder instance`
	`642`	`+ * @return Finder\|SplFileInfo[] The current Finder instance`
`643`	`643`	`*`
`644`	`644`	`* @throws \InvalidArgumentException if one of the directories does not exist`
`645`	`645`	`*/`
`@@ -700,7 +700,7 @@ public function getIterator()`
`700`	`700`	`*`
`701`	`701`	`* @param mixed $iterator`
`702`	`702`	`*`
`703`		`- * @return Finder The finder`
	`703`	`+ * @return Finder\|SplFileInfo[] The finder`
`704`	`704`	`*`
`705`	`705`	`* @throws \InvalidArgumentException When the given argument is not iterable.`
`706`	`706`	`*/`