Merge branch '6.4' into 7.0

* 6.4:
  fix merge
  fix merge
  fix merge

Author: xabbuh

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;
             }