Merge branch '2.6' into 2.7

nicolas-grekas · nicolas-grekas · commit 6da7593f5e08 · 2015-03-27T19:07:56.000+01:00
* 2.6:
  Fix merge
  [VarDumper] Fix dumping ThrowingCasterException

Conflicts:
	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
diff --git a/Tests/Fixtures/php/services19.php b/Tests/Fixtures/php/services19.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * ProjectServiceContainer`
	`12`	`+ * ProjectServiceContainer.`
`13`	`13`	`*`
`14`	`14`	`* This class has been auto-generated`
`15`	`15`	`* by the Symfony Dependency Injection Component.`