Skip to content

Commit 0c0bf5d

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: [Notifier] Fix typo OneSignal DSN Fix blank space typo [Form] Add missing imports in unmapped fields example
2 parents e1bd569 + 5352f0f commit 0c0bf5d

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Configuration Formats
5757
~~~~~~~~~~~~~~~~~~~~~
5858

5959
Unlike other frameworks, Symfony doesn't impose a specific format on you to
60-
configure your applications, but lets you choose between YAML, XML and PHP.
60+
configure your applications, but lets you choose between YAML, XML and PHP.
6161
Throughout the Symfony documentation, all configuration examples will be
6262
shown in these three formats.
6363

forms.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,8 @@ example to add an *"I agree with these terms"* checkbox), set the ``mapped``
907907
option to ``false`` in those fields::
908908

909909
// ...
910+
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
911+
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
910912
use Symfony\Component\Form\FormBuilderInterface;
911913

912914
class TaskType extends AbstractType

notifier.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The notifier component supports the following channels:
3434
services like Slack and Telegram;
3535
* :ref:`Email channel <notifier-email-channel>` integrates the :doc:`Symfony Mailer </mailer>`;
3636
* Browser channel uses :ref:`flash messages <flash-messages>`.
37-
* Push Channel sends notifications to phones and browsers via push notifications.
37+
* :ref:`Push channel <notifier-push-channel>` sends notifications to phones and browsers via push notifications.
3838

3939
.. tip::
4040

@@ -333,6 +333,8 @@ notification emails:
333333
;
334334
};
335335
336+
.. _notifier-push-channel:
337+
336338
Push Channel
337339
~~~~~~~~~~~~
338340

@@ -352,7 +354,7 @@ Service Package DSN
352354
============== ==================================== =================================================================================
353355
Engagespot ``symfony/engagespot-notifier`` ``engagespot://API_KEY@default?campaign_name=CAMPAIGN_NAME``
354356
Expo ``symfony/expo-notifier`` ``expo://Token@default``
355-
OneSignal ``symfony/one-signal-notifier`` ``onesignal://APP_ID:API_KEY@default?defaultRecipientId=DEFAULT_RECIPIENT_ID''``
357+
OneSignal ``symfony/one-signal-notifier`` ``onesignal://APP_ID:API_KEY@default?defaultRecipientId=DEFAULT_RECIPIENT_ID``
356358
============== ==================================== =================================================================================
357359

358360
.. versionadded:: 6.1

0 commit comments

Comments
 (0)