Skip to content

Commit 0ff6007

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: [Notifier] Fix typo OneSignal DSN Fix blank space typo [Form] Add missing imports in unmapped fields example
2 parents 6a80d1e + 298ba48 commit 0ff6007

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
@@ -939,6 +939,8 @@ example to add an *"I agree with these terms"* checkbox), set the ``mapped``
939939
option to ``false`` in those fields::
940940

941941
// ...
942+
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
943+
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
942944
use Symfony\Component\Form\FormBuilderInterface;
943945

944946
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

@@ -304,6 +304,8 @@ notification emails:
304304
;
305305
};
306306
307+
.. _notifier-push-channel:
308+
307309
Push Channel
308310
~~~~~~~~~~~~
309311

@@ -323,7 +325,7 @@ Service Package DSN
323325
============== ==================================== =================================================================================
324326
Engagespot ``symfony/engagespot-notifier`` ``engagespot://API_KEY@default?campaign_name=CAMPAIGN_NAME``
325327
Expo ``symfony/expo-notifier`` ``expo://Token@default``
326-
OneSignal ``symfony/one-signal-notifier`` ``onesignal://APP_ID:API_KEY@default?defaultRecipientId=DEFAULT_RECIPIENT_ID''``
328+
OneSignal ``symfony/one-signal-notifier`` ``onesignal://APP_ID:API_KEY@default?defaultRecipientId=DEFAULT_RECIPIENT_ID``
327329
============== ==================================== =================================================================================
328330

329331
.. versionadded:: 6.1

0 commit comments

Comments
 (0)