Merge branch '3.4' into 4.3

* 3.4: remove 'command' from execute argument Fixes symfony#12662
erop · Nov 23, 2019 · ac9fbb2 · ac9fbb2
2 parents bf930b4 + 6c67c6e
commit ac9fbb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/console.rst b/console.rst
@@ -336,8 +336,6 @@ console::
             $command = $application->find('app:create-user');
             $commandTester = new CommandTester($command);
             $commandTester->execute([
-                'command'  => $command->getName(),
-
                 // pass arguments to the helper
                 'username' => 'Wouter',
 

diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
@@ -147,8 +147,8 @@ encoding algorithm. Also, each algorithm defines different config options:
                     time_cost:    2     # Number of iterations
                     threads:      4     # Number of parallel threads
 
-                # PBKDF2 encoder using SHA512 hashing with default options
-                App\Entity\User: 'sha512'
+                # MessageDigestPasswordEncoder encoder using SHA512 hashing with default options
+                AppBundle\Entity\User: 'sha512'
 
     .. code-block:: xml
 
@@ -193,7 +193,7 @@ encoding algorithm. Also, each algorithm defines different config options:
                     threads="4"
                 />
 
-                <!-- PBKDF2 encoder using SHA512 hashing with default options -->
+                <!-- MessageDigestPasswordEncoder encoder using SHA512 hashing with default options -->
                 <encoder
                     class="App\Entity\User"
                     algorithm="sha512"
@@ -233,7 +233,7 @@ encoding algorithm. Also, each algorithm defines different config options:
                     'threads' => 4,         // Number of parallel threads
                 ],
 
-                // PBKDF2 encoder using SHA512 hashing with default options
+                // MessageDigestPasswordEncoder encoder using SHA512 hashing with default options
                 User::class => [
                     'algorithm' => 'sha512',
                 ],