Skip to content

Commit f4577d1

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Update console.rst [lock] Be more specific about flock releasing locks
2 parents e1c82fd + 87d04f4 commit f4577d1

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
@@ -244,7 +244,8 @@ FlockStore
244244

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

249250
use Symfony\Component\Lock\Store\FlockStore;
250251

console.rst

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

396396
Learn More
397397
----------
@@ -409,5 +409,7 @@ tools capable of helping you with different tasks:
409409
* :doc:`/components/console/helpers/formatterhelper`: customize the output colorization
410410
* :doc:`/components/console/helpers/progressbar`: shows a progress bar
411411
* :doc:`/components/console/helpers/table`: displays tabular data as a table
412+
* :doc:`/components/console/helpers/debug_formatter`: provides functions to
413+
output debug information when running an external program
412414

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

0 commit comments

Comments
 (0)