Merge branch '2.8' into 3.0

fabpot · fabpot · commit 766fcfd9d4b4 · 2016-06-21T07:48:46.000+02:00
* 2.8:
  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/Compiler/AutowirePass.php b/Compiler/AutowirePass.php
@@ -229,7 +229,6 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint, $id)
             $matchingServices = implode(', ', $this->types[$typeHint->name]);
 
             throw new RuntimeException(sprintf('Unable to autowire argument of type "%s" for the service "%s". Multiple services exist for this %s (%s).', $typeHint->name, $id, $classOrInterface, $matchingServices));
-
         }
 
         if (!$typeHint->isInstantiable()) {

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,6 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint, $id)`
`229`	`229`	`$matchingServices = implode(', ', $this->types[$typeHint->name]);`
`230`	`230`
`231`	`231`	`throw new RuntimeException(sprintf('Unable to autowire argument of type "%s" for the service "%s". Multiple services exist for this %s (%s).', $typeHint->name, $id, $classOrInterface, $matchingServices));`
`232`		`-`
`233`	`232`	`}`
`234`	`233`
`235`	`234`	`if (!$typeHint->isInstantiable()) {`