--

saro0h · saro0h · commit 0ca0f46dfc8a · 2015-03-11T21:14:23.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -30,7 +30,7 @@ public function testEncodePasswordPasswordPlainText()
             'command' => 'security:encode-password',
             'password' => 'password',
             'user-class' => 'Symfony\Component\Security\Core\User\User',
-            'salt' => 'AZERTYUIOPOfghjklytrertyuiol,nbcxdfghjkytrfghjk',
+            'salt' => 'AZERTYUIOPOfghjklytrertyuiolnbcxdfghjkytrfghjk',
         ));
         $expected = file_get_contents(__DIR__.'/app/PasswordEncode/plaintext.txt');
 
@@ -43,9 +43,8 @@ public function testEncodePasswordBcrypt()
             'command' => 'security:encode-password',
             'password' => 'password',
             'user-class' => 'Custom\Class\Bcrypt\User',
-            'salt' => 'AZERTYUIOPOfghjklytrertyuiol,nbcxdfghjkytrfghjk',
+            'salt' => 'AZERTYUIOPOfghjklytrertyuiolnbcxdfghjkytrfghjk',
         ));
-
         $expected = file_get_contents(__DIR__.'/app/PasswordEncode/bcrypt.txt');
 
         $this->assertEquals($expected, $this->passwordEncoderCommandTester->getDisplay());
@@ -57,7 +56,7 @@ public function testEncodePasswordPbkdf2()
             'command' => 'security:encode-password',
             'password' => 'password',
             'user-class' => 'Custom\Class\Pbkdf2\User',
-            'salt' => 'AZERTYUIOPOfghjklytrertyuiol,nbcxdfghjkytrfghjk',
+            'salt' => 'AZERTYUIOPOfghjklytrertyuiolnbcxdfghjkytrfghjk',
         ));
 
         $expected = file_get_contents(__DIR__.'/app/PasswordEncode/pbkdf2.txt');
@@ -73,7 +72,7 @@ public function testEncodePasswordNoConfigForGivenUserClass()
             'command' => 'security:encode-password',
             'password' => 'password',
             'user-class' => 'Wrong/User/Class',
-            'salt' => 'AZERTYUIOPOfghjklytrertyuiol,nbcxdfghjkytrfghjk',
+            'salt' => 'AZERTYUIOPOfghjklytrertyuiolnbcxdfghjkytrfghjk',
         ));
     }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bcrypt.txt b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bcrypt.txt
@@ -18,5 +18,5 @@ made in your configuration file containing the security.encoders key.
 | Key              | Value                                                         |
 +------------------+---------------------------------------------------------------+
 | Encoder used     | Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder |
-| Encoded password | $2y$13$OTnDSjPXTSjNSC7kX0foYu11IkBdne5gtTOGR.j2TtiBGETa4gEOy  |
+| Encoded password | $2y$13$AZERTYUIOPOfghjklytreeBTRM4Wd.D3IW7dtnQ6xGA7z3fY8zg4.  |
 +------------------+---------------------------------------------------------------+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/pbkdf2.txt b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/pbkdf2.txt
@@ -18,5 +18,5 @@ made in your configuration file containing the security.encoders key.
 | Key              | Value                                                         |
 +------------------+---------------------------------------------------------------+
 | Encoder used     | Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder |
-| Encoded password | c0lWMUreTNITAMdsvVJZgyAvpr42876VAsmipN98OEaH29oJOpYe+Q==      |
+| Encoded password | nvGk/kUwqj6PHzmqUqXxJA6GEhxD1TSJziV8P4ThqsEi4ZHF6yHp6g==      |
 +------------------+---------------------------------------------------------------+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/plaintext.txt b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/plaintext.txt
@@ -18,5 +18,5 @@ made in your configuration file containing the security.encoders key.
 | Key              | Value                                                            |
 +------------------+------------------------------------------------------------------+
 | Encoder used     | Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder |
-| Encoded password | password{AZERTYUIOPOfghjklytrertyuiol,nbcxdfghjkytrfghjk}        |
+| Encoded password | password{AZERTYUIOPOfghjklytrertyuiolnbcxdfghjkytrfghjk}         |
 +------------------+------------------------------------------------------------------+
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -24,7 +24,7 @@
     "require-dev": {
         "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/browser-kit": "~2.4|~3.0.0",
-        "symfony/console": "~2.3|~3.0.0",
+        "symfony/console": "~2.5|~3.0.0",
         "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
         "symfony/dependency-injection": "~2.3|~3.0.0",
         "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
