Merge branch '7.0' into 7.1

* 7.0: fix merge fix merge fix merge
symfony · May 17, 2024 · 306663f · 306663f
2 parents 5a9f1f5 + 5e5456a
commit 306663f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Tests/Definition/BaseNodeTest.php b/Tests/Definition/BaseNodeTest.php
@@ -41,17 +41,17 @@ protected function validateType($value): void
             {
             }
 
-            protected function normalizeValue($value)
+            protected function normalizeValue($value): mixed
             {
                 return null;
             }
 
-            protected function mergeValues($leftSide, $rightSide)
+            protected function mergeValues($leftSide, $rightSide): mixed
             {
                 return null;
             }
 
-            protected function finalizeValue($value)
+            protected function finalizeValue($value): mixed
             {
                 return null;
             }
@@ -61,7 +61,7 @@ public function hasDefaultValue(): bool
                 return true;
             }
 
-            public function getDefaultValue()
+            public function getDefaultValue(): mixed
             {
                 return null;
             }