Merge 3.x into 4.x

sonata-project · Dec 19, 2023 · 284d25a · 284d25a
2 parents 1936188 + a8a8d16
commit 284d25a
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/tests/Timezone/UserBasedTimezoneDetectorTest.php b/tests/Timezone/UserBasedTimezoneDetectorTest.php
@@ -48,12 +48,22 @@ public function __construct(?string $timezone)
                 $this->timezone = $timezone;
             }
 
-            public function getPassword(): ?string
+            /**
+             * @todo: Remove this method when support for "symfony/security" < 6.0 is dropped.
+             *
+             * @return null
+             */
+            public function getPassword()
             {
                 return null;
             }
 
-            public function getSalt(): ?string
+            /**
+             * @todo: Remove this method when support for "symfony/security" < 6.0 is dropped.
+             *
+             * @return null
+             */
+            public function getSalt()
             {
                 return null;
             }