Skip to content

Commit 9844a29

Browse files
committed
Merge branch '5.0'
* 5.0: [#13000] Fixed newline Update testing.rst [#12722] Added filename comment to avoid confusion Update micro_kernel_trait.rst Update link for (No|Admin)Recipient Typo Update broken links
2 parents d0e01b6 + 268d8fc commit 9844a29

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

configuration/micro_kernel_trait.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ via Composer:
2222
2323
Next, create an ``index.php`` file that defines the kernel class and executes it::
2424

25+
// index.php
2526
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
2627
use Symfony\Component\Config\Loader\LoaderInterface;
2728
use Symfony\Component\DependencyInjection\ContainerBuilder;

notifier.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Twilio ``symfony/twilio-notifier`` ``twilio://SID:TOKEN@default?from=FROM``
5656
Nexmo ``symfony/nexmo-notifier`` ``nexmo://KEY:SECRET@default?from=FROM``
5757
======= =========================== ========================================
5858

59-
To enable a texter, add the add the correct DSN in your ``.env`` file and
59+
To enable a texter, add the correct DSN in your ``.env`` file and
6060
configure the ``texter_transports``:
6161

6262
.. code-block:: bash
@@ -354,16 +354,16 @@ set the notification content and icon.
354354

355355
Symfony provides three types of recipients:
356356

357-
:class:`Symfony\\Component\\Notifier\\Recipient\\NoRecipient``
357+
:class:`Symfony\\Component\\Notifier\\Recipient\\NoRecipient`
358358
This is the default and is useful when there is no need to have
359359
information about the receiver. For example, the browser channel uses
360360
the current requests's :ref:`session flashbag <flash-messages>`;
361361

362-
:class:`Symfony\\Component\\Notifier\\Recipient\\Recipient``
362+
:class:`Symfony\\Component\\Notifier\\Recipient\\Recipient`
363363
This contains only the email address of the user and can be used for
364364
messages on the email and browser channel;
365365

366-
:class:`Symfony\\Component\\Notifier\\Recipient\\AdminRecipient``.
366+
:class:`Symfony\\Component\\Notifier\\Recipient\\AdminRecipient`
367367
This can contain both email address and phonenumber of the user. This
368368
recipient can be used for all channels (depending on whether they are
369369
actually set).

testing.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,8 @@ allows fetching both public and all non-removed private services::
545545

546546
// gives access to the same services used in your test, unless you're using
547547
// $client->insulate() or using real HTTP requests to test your application
548+
// don't forget to call self::bootKernel() before, otherwise, the container
549+
// will be empty
548550
$container = self::$container;
549551

550552
For a list of services available in your application, use the ``debug:container``

0 commit comments

Comments
 (0)