Skip to content

Commit 43dc280

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: remove 'command' from execute argument Fixes #12662 Fix typo in lock.rst
2 parents bee88d6 + ac9fbb2 commit 43dc280

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

components/lock.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ object) and ``isExpired()`` (which returns a boolean).
169169
The Owner of The Lock
170170
---------------------
171171

172-
Locks that are acquired for the first time are owned[1]_ by the ``Lock`` instance that acquired
172+
Locks that are acquired for the first time are owned by the ``Lock`` instance that acquired
173173
it. If you need to check whether the current ``Lock`` instance is (still) the owner of
174174
a lock, you can use the ``isAcquired()`` method::
175175

console.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,6 @@ console::
336336
$command = $application->find('app:create-user');
337337
$commandTester = new CommandTester($command);
338338
$commandTester->execute([
339-
'command' => $command->getName(),
340-
341339
// pass arguments to the helper
342340
'username' => 'Wouter',
343341

reference/configuration/security.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ encoding algorithm. Also, each algorithm defines different config options:
147147
time_cost: 2 # Number of iterations
148148
threads: 4 # Number of parallel threads
149149
150-
# PBKDF2 encoder using SHA512 hashing with default options
151-
App\Entity\User: 'sha512'
150+
# MessageDigestPasswordEncoder encoder using SHA512 hashing with default options
151+
AppBundle\Entity\User: 'sha512'
152152
153153
.. code-block:: xml
154154
@@ -193,7 +193,7 @@ encoding algorithm. Also, each algorithm defines different config options:
193193
threads="4"
194194
/>
195195
196-
<!-- PBKDF2 encoder using SHA512 hashing with default options -->
196+
<!-- MessageDigestPasswordEncoder encoder using SHA512 hashing with default options -->
197197
<encoder
198198
class="App\Entity\User"
199199
algorithm="sha512"
@@ -233,7 +233,7 @@ encoding algorithm. Also, each algorithm defines different config options:
233233
'threads' => 4, // Number of parallel threads
234234
],
235235
236-
// PBKDF2 encoder using SHA512 hashing with default options
236+
// MessageDigestPasswordEncoder encoder using SHA512 hashing with default options
237237
User::class => [
238238
'algorithm' => 'sha512',
239239
],

0 commit comments

Comments
 (0)