Skip to content

Commit ebbfe59

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: [Security] Remove the security.remember_me_aware tag [Doctrine] Warn about DBAL 4.x changes for MariaDB connection
2 parents cbbe8f5 + 979d134 commit ebbfe59

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

reference/configuration/doctrine.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ The following block shows all possible configuration keys:
109109
version).
110110

111111
If you are running a MariaDB database, you must prefix the ``server_version``
112-
value with ``mariadb-`` (e.g. ``server_version: mariadb-10.4.14``).
112+
value with ``mariadb-`` (e.g. ``server_version: mariadb-10.4.14``). This will
113+
change in Doctrine DBAL 4.x, where you must define the version as output by
114+
the server (e.g. ``10.4.14-MariaDB``).
113115

114116
Always wrap the server version number with quotes to parse it as a string
115117
instead of a float number. Otherwise, the floating-point representation

reference/dic_tags.rst

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -953,22 +953,6 @@ This tag is used to automatically register :ref:`expression function providers
953953
component. Using these providers, you can add custom functions to the security
954954
expression language.
955955

956-
security.remember_me_aware
957-
--------------------------
958-
959-
**Purpose**: To allow remember me authentication
960-
961-
This tag is used internally to allow remember-me authentication to work.
962-
If you have a custom authentication method where a user can be remember-me
963-
authenticated, then you may need to use this tag.
964-
965-
If your custom authentication factory extends
966-
:class:`Symfony\\Bundle\\SecurityBundle\\DependencyInjection\\Security\\Factory\\AbstractFactory`
967-
and your custom authentication listener extends
968-
:class:`Symfony\\Component\\Security\\Http\\Firewall\\AbstractAuthenticationListener`,
969-
then your custom authentication listener will automatically have this tag
970-
applied and it will function automatically.
971-
972956
security.voter
973957
--------------
974958

0 commit comments

Comments
 (0)