Skip to content

Commit 206e23b

Browse files
committed
Merge branch '4.4'
* 4.4: Add flock:// option to framework lock configuration reference
2 parents 4ce4bd5 + 370b1b6 commit 206e23b

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

reference/configuration/framework.rst

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2629,11 +2629,12 @@ A list of lock stores to be created by the framework extension.
26292629

26302630
.. code-block:: yaml
26312631
2632-
# app/config/config.yml
2632+
# config/packages/lock.yml
26332633
framework:
26342634
# these are all the supported lock stores
26352635
lock: ~
26362636
lock: 'flock'
2637+
lock: 'flock:///path/to/file'
26372638
lock: 'semaphore'
26382639
lock: 'memcached://m1.docker'
26392640
lock: ['memcached://m1.docker', 'memcached://m2.docker']
@@ -2648,7 +2649,7 @@ A list of lock stores to be created by the framework extension.
26482649
26492650
.. code-block:: xml
26502651
2651-
<!-- app/config/config.xml -->
2652+
<!-- config/packages/lock.xml -->
26522653
<?xml version="1.0" encoding="UTF-8" ?>
26532654
<container xmlns="http://symfony.com/schema/dic/services"
26542655
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -2662,6 +2663,8 @@ A list of lock stores to be created by the framework extension.
26622663
<!-- these are all the supported lock stores -->
26632664
<framework:resource>flock</framework:resource>
26642665
2666+
<framework:resource>flock:///path/to/file</framework:resource>
2667+
26652668
<framework:resource>semaphore</framework:resource>
26662669
26672670
<framework:resource>memcached://m1.docker</framework:resource>
@@ -2686,11 +2689,12 @@ A list of lock stores to be created by the framework extension.
26862689
26872690
.. code-block:: php
26882691
2689-
// app/config/config.php
2692+
// config/packages/lock.php
26902693
$container->loadFromExtension('framework', [
26912694
// these are all the supported lock stores
26922695
'lock' => null,
26932696
'lock' => 'flock',
2697+
'lock' => 'flock:///path/to/file',
26942698
'lock' => 'semaphore',
26952699
'lock' => 'memcached://m1.docker',
26962700
'lock' => ['memcached://m1.docker', 'memcached://m2.docker'],
@@ -2705,6 +2709,10 @@ A list of lock stores to be created by the framework extension.
27052709
],
27062710
]);
27072711
2712+
.. versionadded:: 4.2
2713+
2714+
The ``flock://`` store was introduced in Symfony 4.2.
2715+
27082716
.. _reference-lock-resources-name:
27092717

27102718
name

0 commit comments

Comments
 (0)