Skip to content

Commit 3faa614

Browse files
committed
Merge branch '5.0' into 5.1
* 5.0: corrected argument type Update serializer.rst Replaced orphan " and" at the end of the sentence by a dot Add missing dot at the end of a sentence
2 parents 383a413 + e5f1c17 commit 3faa614

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

components/cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ spends 5 seconds to compute data that is cached for 1 hour and this data is acce
9797
is fine. But after 1 hour, we get 10 new requests to a cold cache. So the data
9898
is computed again. The next second the same thing happens. So the data is computed
9999
about 50 times before the cache is warm again. This is where you need stampede
100-
prevention
100+
prevention.
101101

102102
The first solution is to use locking: only allow one PHP process (on a per-host basis)
103103
to compute a specific key at a time. Locking is built-in by default, so

components/event_dispatcher.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ Dispatch the Event
328328
The :method:`Symfony\\Component\\EventDispatcher\\EventDispatcher::dispatch`
329329
method notifies all listeners of the given event. It takes two arguments:
330330
the ``Event`` instance to pass to each listener of that event and the name
331-
of the event to dispatch and ::
331+
of the event to dispatch::
332332

333333
use Acme\Store\Event\OrderPlacedEvent;
334334
use Acme\Store\Order;

components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ These are the options available:
12121212
Sets the root node name (default: ``response``).
12131213

12141214
``remove_empty_tags``
1215-
If set to true, removes all empty tags in the generated XML.
1215+
If set to true, removes all empty tags in the generated XML (default: ``false``).
12161216

12171217
Handling Constructor Arguments
12181218
------------------------------

workflow.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ place::
626626
// Block the transition "publish" if it is more than 8 PM
627627
// with the message for end user
628628
$explanation = $event->getMetadata('explanation', $eventTransition);
629-
$event->addTransitionBlocker(new TransitionBlocker($explanation , 0));
629+
$event->addTransitionBlocker(new TransitionBlocker($explanation , '0'));
630630
}
631631

632632
public static function getSubscribedEvents()

0 commit comments

Comments
 (0)