Merge branch '2.7' into 2.8

Tobion · Tobion · commit da308625d391 · 2015-09-09T20:05:45.000+02:00
Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/Core/Tests/Encoder/EncoderFactoryTest.php b/Core/Tests/Encoder/EncoderFactoryTest.php
@@ -107,7 +107,7 @@ public function testGetNullNamedEncoderForEncoderAware()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testGetInvalidNamedEncoderForEncoderAware()
     {
diff --git a/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php b/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
@@ -250,7 +250,7 @@ public function testEncodeCookieAndDecodeCookieAreInvertible()
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage cookie delimiter
      */
     public function testThereShouldBeNoCookieDelimiterInCookieParts()

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function testGetNullNamedEncoderForEncoderAware()`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/**`
`110`		`- * @expectedException RuntimeException`
	`110`	`+ * @expectedException \RuntimeException`
`111`	`111`	`*/`
`112`	`112`	`public function testGetInvalidNamedEncoderForEncoderAware()`
`113`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ public function testEncodeCookieAndDecodeCookieAreInvertible()`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`/**`
`253`		`- * @expectedException InvalidArgumentException`
	`253`	`+ * @expectedException \InvalidArgumentException`
`254`	`254`	`* @expectedExceptionMessage cookie delimiter`
`255`	`255`	`*/`
`256`	`256`	`public function testThereShouldBeNoCookieDelimiterInCookieParts()`