Merge branch '5.2' into 5.x

* 5.2:
  Tweaks
  Update DSN
  Update DSN
  Support JWT v4
  Remove UuidBinary/UlidBinary usages from documentation

Author: javiereguiluz

components/uid.rst

@@ -115,9 +115,8 @@ UUID objects created with the ``Uuid`` class can use the following methods
 Storing UUIDs in Databases
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can store UUID values as any other regular string/binary values in the database.
-However, if you :doc:`use Doctrine </doctrine>`, it's more convenient to use the
-special Doctrine types which convert to/from UUID objects automatically::
+If you :doc:`use Doctrine </doctrine>`, consider using the ``uuid`` Doctrine
+type, which converts to/from UUID objects automatically::
 
     // src/Entity/Product.php
     namespace App\Entity;
@@ -134,11 +133,6 @@ special Doctrine types which convert to/from UUID objects automatically::
          */
         private $someProperty;
 
-        /**
-         * @ORM\Column(type="uuid_binary")
-         */
-        private $anotherProperty;
-
         // ...
     }
 
@@ -166,7 +160,7 @@ entity primary keys::
 
 .. versionadded:: 5.2
 
-    The UUID types and generators were introduced in Symfony 5.2.
+    The UUID type and generators were introduced in Symfony 5.2.
 
 When using built-in Doctrine repository methods (e.g. ``findOneBy()``), Doctrine
 knows how to convert these UUID types to build the SQL query
@@ -260,9 +254,8 @@ ULID objects created with the ``Ulid`` class can use the following methods::
 Storing ULIDs in Databases
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can store ULID values as any other regular string/binary values in the database.
-However, if you :doc:`use Doctrine </doctrine>`, it's more convenient to use the
-special Doctrine types which convert to/from ULID objects automatically::
+If you :doc:`use Doctrine </doctrine>`, consider using the ``ulid`` Doctrine
+type, which converts to/from ULID objects automatically::
 
     // src/Entity/Product.php
     namespace App\Entity;
@@ -279,11 +272,6 @@ special Doctrine types which convert to/from ULID objects automatically::
          */
         private $someProperty;
 
-        /**
-         * @ORM\Column(type="ulid_binary")
-         */
-        private $anotherProperty;
-
         // ...
     }
 
@@ -310,7 +298,7 @@ entity primary keys::
 
 .. versionadded:: 5.2
 
-    The ULID types and generator were introduced in Symfony 5.2.
+    The ULID type and generator were introduced in Symfony 5.2.
 
 When using built-in Doctrine repository methods (e.g. ``findOneBy()``), Doctrine
 knows how to convert these ULID types to build the SQL query

mercure.rst

@@ -423,10 +423,10 @@ And here is the controller::
         {
             $hubUrl = $this->getParameter('mercure.default_hub');
             $this->addLink($request, new Link('mercure', $hubUrl));
-            
+
             $key = Key\InMemory::plainText('mercure_secret_key'); // don't forget to set this parameter! Test value: !ChangeMe!
             $configuration = Configuration::forSymmetricSigner(new Sha256(), $key);
-            
+
             $token = $configuration->builder()
                 ->withClaim('mercure', ['subscribe' => ["http://example.com/books/1"]]) // can also be a URI template, or *
                 ->getToken($configuration->signer(), $configuration->signingKey())

notifier.rst

@@ -59,7 +59,7 @@ Service     Package                           DSN
 ==========  ================================  ====================================================
 Esendex     ``symfony/esendex-notifier``      ``esendex://USER_NAME:PASSWORD@default?accountreference=ACCOUNT_REFERENCE&from=FROM``
 FreeMobile  ``symfony/free-mobile-notifier``  ``freemobile://LOGIN:PASSWORD@default?phone=PHONE``
-Infobip     ``symfony/infobip-notifier``      ``infobip://TOKEN@default?from=FROM``
+Infobip     ``symfony/infobip-notifier``      ``infobip://ACCESS_TOKEN@HOST?from=FROM``
 Iqsms       ``symfony/iqsms-notifier``        ``iqsms://LOGIN:PASSWORD@default?from=FROM``
 Mobyt       ``symfony/mobyt-notifier``        ``mobyt://USER_KEY:ACCESS_TOKEN@default?from=FROM``
 Nexmo       ``symfony/nexmo-notifier``        ``nexmo://KEY:SECRET@default?from=FROM``
@@ -144,15 +144,16 @@ integration with these chat services:
 
 ==========  ================================  ===========================================================================
 Service     Package                           DSN
+<<<<<<< HEAD
 ==========  ================================  ===========================================================================
 Discord     ``symfony/discord-notifier``      ``discord://TOKEN@default?webhook_id=ID``
 GoogleChat  ``symfony/google-chat-notifier``  ``googlechat://ACCESS_KEY:ACCESS_TOKEN@default/SPACE?threadKey=THREAD_KEY``
 LinkedIn    ``symfony/linked-in-notifier``    ``linkedin://TOKEN:USER_ID@default``
-Mattermost  ``symfony/mattermost-notifier``   ``mattermost://TOKEN@ENDPOINT?channel=CHANNEL``
+Mattermost  ``symfony/mattermost-notifier``   ``mattermost://ACCESS_TOKEN@HOST/PATH?channel=CHANNEL``
 RocketChat  ``symfony/rocket-chat-notifier``  ``rocketchat://TOKEN@ENDPOINT?channel=CHANNEL``
 Slack       ``symfony/slack-notifier``        ``slack://TOKEN@default?channel=CHANNEL``
 Telegram    ``symfony/telegram-notifier``     ``telegram://TOKEN@default?channel=CHAT_ID``
-Zulip       ``symfony/zulip-notifier``        ``zulip://EMAIL:APIKEY@ENDPOINT?channel=CHANNEL``
+Zulip       ``symfony/zulip-notifier``        ``zulip://EMAIL:TOKEN@HOST?channel=CHANNEL``
 ==========  ================================  ===========================================================================
 
 .. versionadded:: 5.1