Merge branch '2.3' into 2.4

fabpot · fabpot · commit 89abc0c8c8b9 · 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/Authentication/AuthenticationProviderManagerTest.php b/Tests/Authentication/AuthenticationProviderManagerTest.php
@@ -20,7 +20,7 @@
 class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testAuthenticateWithoutProviders()
     {
diff --git a/Tests/Authentication/Token/RememerMeTokenTest.php b/Tests/Authentication/Token/RememerMeTokenTest.php
@@ -53,7 +53,7 @@ public function testConstructorKeyCannotBeEmptyString()
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error
+     * @expectedException \PHPUnit_Framework_Error
      * @dataProvider getUserArguments
      */
     public function testConstructorUserCannotBeNull($user)
diff --git a/Tests/Authentication/Token/UsernamePasswordTokenTest.php b/Tests/Authentication/Token/UsernamePasswordTokenTest.php
@@ -28,7 +28,7 @@ public function testConstructor()
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
      */
     public function testSetAuthenticatedToTrue()
     {
diff --git a/Tests/Authorization/AccessDecisionManagerTest.php b/Tests/Authorization/AccessDecisionManagerTest.php
@@ -47,7 +47,7 @@ public function testSupportsAttribute()
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testSetVotersEmpty()
     {
diff --git a/Tests/Encoder/BasePasswordEncoderTest.php b/Tests/Encoder/BasePasswordEncoderTest.php
@@ -46,7 +46,7 @@ public function testMergePasswordAndSalt()
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testMergePasswordAndSaltWithException()
     {
diff --git a/Tests/Encoder/MessageDigestPasswordEncoderTest.php b/Tests/Encoder/MessageDigestPasswordEncoderTest.php
@@ -35,7 +35,7 @@ public function testEncodePassword()
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
      */
     public function testEncodePasswordAlgorithmDoesNotExist()
     {
diff --git a/Tests/Encoder/Pbkdf2PasswordEncoderTest.php b/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
@@ -35,7 +35,7 @@ public function testEncodePassword()
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
      */
     public function testEncodePasswordAlgorithmDoesNotExist()
     {
diff --git a/Tests/User/InMemoryProviderTest.php b/Tests/User/InMemoryProviderTest.php
@@ -42,7 +42,7 @@ public function testCreateUser()
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
      */
     public function testCreateUserAlreadyExist()
     {
diff --git a/Tests/User/UserTest.php b/Tests/User/UserTest.php
@@ -17,7 +17,7 @@ class UserTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @covers Symfony\Component\Security\Core\User\User::__construct
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testConstructorException()
     {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase`
`21`	`21`	`{`
`22`	`22`	`/**`
`23`		`- * @expectedException InvalidArgumentException`
	`23`	`+ * @expectedException \InvalidArgumentException`
`24`	`24`	`*/`
`25`	`25`	`public function testAuthenticateWithoutProviders()`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function testConstructorKeyCannotBeEmptyString()`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`56`		`- * @expectedException PHPUnit_Framework_Error`
	`56`	`+ * @expectedException \PHPUnit_Framework_Error`
`57`	`57`	`* @dataProvider getUserArguments`
`58`	`58`	`*/`
`59`	`59`	`public function testConstructorUserCannotBeNull($user)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function testConstructor()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`
`31`		`- * @expectedException LogicException`
	`31`	`+ * @expectedException \LogicException`
`32`	`32`	`*/`
`33`	`33`	`public function testSetAuthenticatedToTrue()`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function testSupportsAttribute()`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`50`		`- * @expectedException InvalidArgumentException`
	`50`	`+ * @expectedException \InvalidArgumentException`
`51`	`51`	`*/`
`52`	`52`	`public function testSetVotersEmpty()`
`53`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function testMergePasswordAndSalt()`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
`49`		`- * @expectedException InvalidArgumentException`
	`49`	`+ * @expectedException \InvalidArgumentException`
`50`	`50`	`*/`
`51`	`51`	`public function testMergePasswordAndSaltWithException()`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function testEncodePassword()`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
`38`		`- * @expectedException LogicException`
	`38`	`+ * @expectedException \LogicException`
`39`	`39`	`*/`
`40`	`40`	`public function testEncodePasswordAlgorithmDoesNotExist()`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function testCreateUser()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
`45`		`- * @expectedException LogicException`
	`45`	`+ * @expectedException \LogicException`
`46`	`46`	`*/`
`47`	`47`	`public function testCreateUserAlreadyExist()`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class UserTest extends \PHPUnit_Framework_TestCase`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* @covers Symfony\Component\Security\Core\User\User::__construct`
`20`		`- * @expectedException InvalidArgumentException`
	`20`	`+ * @expectedException \InvalidArgumentException`
`21`	`21`	`*/`
`22`	`22`	`public function testConstructorException()`
`23`	`23`	`{`