Skip to content

Commit cdaba3a

Browse files
committed
Merge branch '5.2' into 5.3
* 5.2: Typo with backslashes [Lock] Remove note about sharing the key
2 parents 20e325c + c7903ce commit cdaba3a

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

components/lock.rst

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -618,12 +618,7 @@ Remote stores (:ref:`MemcachedStore <lock-store-memcached>`,
618618
:ref:`ZookeeperStore <lock-store-zookeeper>`) use a unique token to recognize
619619
the true owner of the lock. This token is stored in the
620620
:class:`Symfony\\Component\\Lock\\Key` object and is used internally by
621-
the ``Lock``, therefore this key must not be shared between processes (session,
622-
caching, fork, ...).
623-
624-
.. caution::
625-
626-
Do not share a key between processes.
621+
the ``Lock``.
627622

628623
Every concurrent process must store the ``Lock`` in the same server. Otherwise two
629624
different machines may allow two different processes to acquire the same ``Lock``.

service_container.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ example, suppose you want to make the admin email configurable:
397397
398398
If you make this change and refresh, you'll see an error:
399399

400-
Cannot autowire service "App\Service\SiteUpdateManager": argument "$adminEmail"
400+
Cannot autowire service "App\\Service\\SiteUpdateManager": argument "$adminEmail"
401401
of method "__construct()" must have a type-hint or be given a value explicitly.
402402

403403
That makes sense! There is no way that the container knows what value you want to

0 commit comments

Comments
 (0)