Merge branch '2.3' into 2.4

fabpot · fabpot · commit f443ddf26460 · 2013-11-26T17:40:27.000+01:00
* 2.3: Fixed mistake in upgrade docu Container::camelize also takes backslashes into consideration fixed typos fixed @ExpectedException class names fixed some typos fixed @ExpectedException class names Typo and better wording for german validator translation
diff --git a/Tests/Firewall/LogoutListenerTest.php b/Tests/Firewall/LogoutListenerTest.php
@@ -122,7 +122,7 @@ public function testHandleMatchedPathWithoutSuccessHandlerAndCsrfValidation()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testSuccessHandlerReturnsNonResponse()
     {
diff --git a/Tests/Firewall/X509AuthenticationListenerTest.php b/Tests/Firewall/X509AuthenticationListenerTest.php
@@ -57,7 +57,7 @@ public static function dataProviderGetPreAuthenticatedData()
     }
 
     /**
-     * @expectedException Symfony\Component\Security\Core\Exception\BadCredentialsException
+     * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
      */
     public function testGetPreAuthenticatedDataNoUser()
     {

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function testHandleMatchedPathWithoutSuccessHandlerAndCsrfValidation()`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`/**`
`125`		`- * @expectedException RuntimeException`
	`125`	`+ * @expectedException \RuntimeException`
`126`	`126`	`*/`
`127`	`127`	`public function testSuccessHandlerReturnsNonResponse()`
`128`	`128`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static function dataProviderGetPreAuthenticatedData()`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
`60`		`- * @expectedException Symfony\Component\Security\Core\Exception\BadCredentialsException`
	`60`	`+ * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException`
`61`	`61`	`*/`
`62`	`62`	`public function testGetPreAuthenticatedDataNoUser()`
`63`	`63`	`{`