Merge branch '2.7' into 2.8

fabpot · fabpot · commit cad8e7020cb8 · 2016-06-21T07:36:02.000+02:00
* 2.7:
  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
  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
@@ -667,7 +667,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
`@@ -667,7 +667,7 @@ public function in($dirs)`
`667`	`667`	`*`
`668`	`668`	`* This method implements the IteratorAggregate interface.`
`669`	`669`	`*`
`670`		`- * @return \Iterator An iterator`
	`670`	`+ * @return \Iterator\|SplFileInfo[] An iterator`
`671`	`671`	`*`
`672`	`672`	`* @throws \LogicException if the in() method has not been called`
`673`	`673`	`*/`