Merge branch '3.0' into 3.1

fabpot · fabpot · commit 972a4b1cde92 · 2016-06-21T07:59:09.000+02:00
* 3.0:
  fixed CS
  fixed CS
  fixed CS
  tweaked default CS fixer config
  [HttpKernel] Dont close the output stream in debug
  move HttpKernel component to require section
  Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284
  [Session] fix PDO transaction aborted under PostgreSQL
  [Console] Use InputInterface inherited doc as possible
  Mention generating absolute urls in UPGRADE files and CHANGELOG
  add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support
  FormBuilderInterface: fix getForm() return type.
  Fixed typo in PHPDoc
diff --git a/Finder.php b/Finder.php
@@ -557,7 +557,7 @@ public function in($dirs)
      *
      * This method implements the IteratorAggregate interface.
      *
-     * @return \Iterator An iterator
+     * @return \Iterator|SplFileInfo[] An iterator
      *
      * @throws \LogicException if the in() method has not been called
      */

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ public function in($dirs)`
`557`	`557`	`*`
`558`	`558`	`* This method implements the IteratorAggregate interface.`
`559`	`559`	`*`
`560`		`- * @return \Iterator An iterator`
	`560`	`+ * @return \Iterator\|SplFileInfo[] An iterator`
`561`	`561`	`*`
`562`	`562`	`* @throws \LogicException if the in() method has not been called`
`563`	`563`	`*/`