Skip to content

Commit d5c1688

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

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
@@ -164,7 +164,7 @@ object) and ``isExpired()`` (which returns a boolean).
164164
The Owner of The Lock
165165
---------------------
166166

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

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
@@ -146,8 +146,8 @@ encoding algorithm. Also, each algorithm defines different config options:
146146
memory_cost: 16384 # Amount in KiB. (16384 = 16 MiB)
147147
time_cost: 2 # Number of iterations
148148
149-
# PBKDF2 encoder using SHA512 hashing with default options
150-
App\Entity\User: 'sha512'
149+
# MessageDigestPasswordEncoder encoder using SHA512 hashing with default options
150+
AppBundle\Entity\User: 'sha512'
151151
152152
.. code-block:: xml
153153
@@ -190,7 +190,7 @@ encoding algorithm. Also, each algorithm defines different config options:
190190
time_cost="2"
191191
/>
192192
193-
<!-- PBKDF2 encoder using SHA512 hashing with default options -->
193+
<!-- MessageDigestPasswordEncoder encoder using SHA512 hashing with default options -->
194194
<encoder
195195
class="App\Entity\User"
196196
algorithm="sha512"
@@ -229,7 +229,7 @@ encoding algorithm. Also, each algorithm defines different config options:
229229
'time_cost' => 2, // Number of iterations
230230
],
231231
232-
// PBKDF2 encoder using SHA512 hashing with default options
232+
// MessageDigestPasswordEncoder encoder using SHA512 hashing with default options
233233
User::class => [
234234
'algorithm' => 'sha512',
235235
],

0 commit comments

Comments
 (0)