Merge branch '5.1' into 5.2

* 5.1:
  Restore the quotes wraping the DATABASE_URL value
  Update doctrine.rst
  Update dbal.rst
  Update doctrine.rst
  Update testing.rst

Author: javiereguiluz

doctrine.rst

@@ -46,6 +46,9 @@ The database connection information is stored as an environment variable called
     # customize this line!
     DATABASE_URL="mysql://db_user:[email protected]:3306/db_name?serverVersion=5.7"
 
+    # to use mariadb:
+    DATABASE_URL="mysql://db_user:[email protected]:3306/db_name?serverVersion=mariadb-10.5.8"
+
     # to use sqlite:
     # DATABASE_URL="sqlite:///%kernel.project_dir%/var/app.db"
     

doctrine/dbal.rst

@@ -35,7 +35,7 @@ Then configure the ``DATABASE_URL`` environment variable in ``.env``:
     # .env (or override DATABASE_URL in .env.local to avoid committing your changes)
 
     # customize this line!
-    DATABASE_URL="mysql://db_user:[email protected]:3306/db_name"
+    DATABASE_URL="mysql://db_user:[email protected]:3306/db_name?serverVersion=5.7"
 
 Further things can be configured in ``config/packages/doctrine.yaml`` - see
 :ref:`reference-dbal-configuration`. Remove the ``orm`` key in that file

reference/configuration/doctrine.rst

@@ -65,7 +65,7 @@ The following block shows all possible configuration keys:
                 charset:              UTF8
                 logging:              '%kernel.debug%'
                 platform_service:     App\DBAL\MyDatabasePlatformService
-                server_version:       '5.6'
+                server_version:       '5.7'
                 mapping_types:
                     enum: string
                 types:
@@ -99,7 +99,7 @@ The following block shows all possible configuration keys:
                     charset="UTF8"
                     logging="%kernel.debug%"
                     platform-service="App\DBAL\MyDatabasePlatformService"
-                    server-version="5.6">
+                    server-version="5.7">
 
                     <doctrine:option key="foo">bar</doctrine:option>
                     <doctrine:mapping-type name="enum">string</doctrine:mapping-type>
@@ -121,8 +121,8 @@ The following block shows all possible configuration keys:
 
     Always wrap the server version number with quotes to parse it as a string
     instead of a float number. Otherwise, the floating-point representation
-    issues can make your version be considered a different number (e.g. ``5.6``
-    will be rounded as ``5.5999999999999996447286321199499070644378662109375``).
+    issues can make your version be considered a different number (e.g. ``5.7``
+    will be rounded as ``5.6999999999999996447286321199499070644378662109375``).
 
     If you don't define this option and you haven't created your database
     yet, you may get ``PDOException`` errors because Doctrine will try to

testing.rst

@@ -1032,7 +1032,7 @@ need in your ``.env.test`` file:
 .. code-block:: text
 
     # .env.test
-    DATABASE_URL="mysql://db_user:[email protected]:3306/db_name_test"
+    DATABASE_URL="mysql://db_user:[email protected]:3306/db_name_test?serverVersion=5.7"
 
     # use SQLITE
     # DATABASE_URL="sqlite:///%kernel.project_dir%/var/app.db"