Merge branch '5.4' into 6.3

* 5.4: fix compatibility with Doctrine DBAL 4 ensure string type with mbstring func overloading enabled [Validator] updated Greek translation [Cache][HttpFoundation][Lock] Fix empty username/password for PDO PostgreSQL
symfony · Nov 7, 2023 · ce33267 · ce33267
2 parents 59d1837 + f84fd4f
commit ce33267
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/HeaderUtils.php b/HeaderUtils.php
@@ -256,7 +256,7 @@ public static function parseQuery(string $query, bool $ignoreBrackets = false, s
     private static function groupParts(array $matches, string $separators, bool $first = true): array
     {
         $separator = $separators[0];
-        $separators = substr($separators, 1);
+        $separators = substr($separators, 1) ?: '';
         $i = 0;
 
         if ('' === $separators && !$first) {

diff --git a/Session/Storage/Handler/PdoSessionHandler.php b/Session/Storage/Handler/PdoSessionHandler.php
@@ -90,12 +90,12 @@ class PdoSessionHandler extends AbstractSessionHandler
     /**
      * Username when lazy-connect.
      */
-    private string $username = '';
+    private ?string $username = null;
 
     /**
      * Password when lazy-connect.
      */
-    private string $password = '';
+    private ?string $password = null;
 
     /**
      * Connection options when lazy-connect.