Skip to content

Commit 045b573

Browse files
committed
Merge branch '5.0' into 5.1
* 5.0: Update console.rst [lock] Be more specific about flock releasing locks
2 parents 1eac864 + 3bac3fb commit 045b573

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

components/lock.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ FlockStore
234234

235235
The FlockStore uses the file system on the local computer to create the locks.
236236
It does not support expiration, but the lock is automatically released when the
237-
PHP process is terminated::
237+
lock object goes out of scope and is freed by the garbage collector (for example
238+
when the PHP process ends)::
238239

239240
use Symfony\Component\Lock\Store\FlockStore;
240241

console.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ Whenever an exception is thrown while running commands, Symfony adds a log
400400
message for it including the entire failing command. In addition, Symfony
401401
registers an :doc:`event subscriber </event_dispatcher>` to listen to the
402402
:ref:`ConsoleEvents::TERMINATE event <console-events-terminate>` and adds a log
403-
message whenever a command doesn't finish with the ``0`` exit status.
403+
message whenever a command doesn't finish with the ``0`` `exit status`_.
404404

405405
Learn More
406406
----------
@@ -418,5 +418,7 @@ tools capable of helping you with different tasks:
418418
* :doc:`/components/console/helpers/formatterhelper`: customize the output colorization
419419
* :doc:`/components/console/helpers/progressbar`: shows a progress bar
420420
* :doc:`/components/console/helpers/table`: displays tabular data as a table
421+
* :doc:`/components/console/helpers/debug_formatter`: provides functions to
422+
output debug information when running an external program
421423

422424
.. _`exit status`: https://en.wikipedia.org/wiki/Exit_status

0 commit comments

Comments
 (0)