Merge branch '2.7' into 2.8

Tobion · Tobion · commit c1e22d4271ce · 2015-09-09T20:05:45.000+02:00
Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/Tests/DependencyInjection/MainConfigurationTest.php b/Tests/DependencyInjection/MainConfigurationTest.php
@@ -92,7 +92,7 @@ public function testCsrfAliases()
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testCsrfOriginalAndAliasValueCausesException()
     {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function testCsrfAliases()`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/**`
`95`		`- * @expectedException InvalidArgumentException`
	`95`	`+ * @expectedException \InvalidArgumentException`
`96`	`96`	`*/`
`97`	`97`	`public function testCsrfOriginalAndAliasValueCausesException()`
`98`	`98`	`{`