Skip to content

Commit 4844e99

Browse files
committed
Merge branch '4.4'
* 4.4: Fix indention Use ordered use statements for php code examples No explicit use of code-block:: php
2 parents 189f4f1 + c4fb7ce commit 4844e99

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

components/http_client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@ so that the :doc:`HttpKernel component </components/http_kernel>` needs to be
551551
installed in your application::
552552

553553
use Symfony\Component\HttpClient\CachingHttpClient;
554-
use Symfony\Component\HttpKernel\HttpCache\Store;
555554
use Symfony\Component\HttpClient\HttpClient;
555+
use Symfony\Component\HttpKernel\HttpCache\Store;
556556

557557
$store = new Store('/path/to/cache/storage/');
558558
$client = HttpClient::create();

components/validator/resources.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ prefixed classes included in doc block comments (``/** ... */``). For example::
100100
class User
101101
{
102102
/**
103-
* @Assert\NotBlank
104-
*/
103+
* @Assert\NotBlank
104+
*/
105105
protected $name;
106106
}
107107

messenger/message-recorder.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ using the ``DispatchAfterCurrentBusMiddleware`` and adding a
5252
use App\Messenger\Event\UserRegistered;
5353
use Doctrine\ORM\EntityManagerInterface;
5454
use Symfony\Component\Messenger\Envelope;
55-
use Symfony\Component\Messenger\Stamp\DispatchAfterCurrentBusStamp;
5655
use Symfony\Component\Messenger\MessageBusInterface;
56+
use Symfony\Component\Messenger\Stamp\DispatchAfterCurrentBusStamp;
5757

5858
class RegisterUserHandler
5959
{

translation/message_format.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Usage of this string is the same as with variables and select::
226226

227227
You can also set an ``offset`` variable to determine whether the
228228
pluralization should be offset (e.g. in sentences like ``You and # other people``
229-
/ ``You and # other person``).
229+
/ ``You and # other person``).
230230

231231
.. tip::
232232

@@ -235,23 +235,23 @@ Usage of this string is the same as with variables and select::
235235

236236
.. code-block:: text
237237
238-
{gender_of_host, select,
238+
{gender_of_host, select,
239239
female {
240-
{num_guests, plural, offset:1
240+
{num_guests, plural, offset:1
241241
=0 {{host} does not give a party.}
242242
=1 {{host} invites {guest} to her party.}
243243
=2 {{host} invites {guest} and one other person to her party.}
244244
other {{host} invites {guest} and # other people to her party.}}
245245
}
246246
male {
247-
{num_guests, plural, offset:1
247+
{num_guests, plural, offset:1
248248
=0 {{host} does not give a party.}
249249
=1 {{host} invites {guest} to his party.}
250250
=2 {{host} invites {guest} and one other person to his party.}
251251
other {{host} invites {guest} and # other people to his party.}}
252252
}
253253
other {
254-
{num_guests, plural, offset:1
254+
{num_guests, plural, offset:1
255255
=0 {{host} does not give a party.}
256256
=1 {{host} invites {guest} to their party.}
257257
=2 {{host} invites {guest} and one other person to their party.}
@@ -373,9 +373,8 @@ using the :phpclass:`IntlDateFormatter`:
373373
];
374374
375375
The "function statement" for the ``time`` and ``date`` functions can be one of
376-
short, medium, long or full, as documented on PHP.net.
377-
378-
.. code-block:: php
376+
``short``, ``medium``, ``long`` or ``full``, which correspond to the
377+
`constants defined by the IntlDateFormatter class`_::
379378

380379
// prints "Published at Jan 25, 2019 - 11:30 AM"
381380
echo $translator->trans('published_at', ['publication_date' => new \DateTime('2019-01-25 11:30:00')]);
@@ -437,3 +436,4 @@ The ``number`` formatter allows you to format numbers using Intl's :phpclass:`Nu
437436
.. _`ICU MessageFormat`: http://userguide.icu-project.org/formatparse/messages
438437
.. _`switch statement`: https://php.net/control-structures.switch
439438
.. _`Language Plural Rules`: http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html
439+
.. _`constants defined by the IntlDateFormatter class`: https://php.net/manual/en/class.intldateformatter.php

0 commit comments

Comments
 (0)