Skip to content

Commit f3e4c11

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Update lock.rst Update testing.rst
2 parents ea80dd0 + db88c69 commit f3e4c11

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

components/lock.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ method, the resource will stay locked until the timeout::
153153

154154
.. tip::
155155

156-
To avoid letting the lock in a locking state, it's recommended to wrap the
156+
To avoid leaving the lock in a locked state, it's recommended to wrap the
157157
job in a try/catch/finally block to always try to release the expiring lock.
158158

159159
In case of long-running tasks, it's better to start with a not too long TTL and

testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ If you want to test an entire feature of your application (e.g. registering as a
6363
user or generating an invoice), see the section about :ref:`Functional Tests <functional-tests>`.
6464

6565
Writing Symfony unit tests is no different from writing standard PHPUnit
66-
unit tests. Suppose, for example, that you have an class called ``Calculator``
66+
unit tests. Suppose, for example, that you have a class called ``Calculator``
6767
in the ``src/Util/`` directory of the app::
6868

6969
// src/Util/Calculator.php

0 commit comments

Comments
 (0)