Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit ed5527bde521 · 2019-08-20T16:44:19.000+02:00
* 4.3: cs fix Fix inconsistent return points. [Config] Add handling for ignored keys in ArrayNode::mergeValues. Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null [Router] Fix TraceableUrlMatcher behaviour with trailing slash Revert "bug symfony#33092 [DependencyInjection] Improve an exception message (fabpot)"
diff --git a/Normalizer/AbstractObjectNormalizer.php b/Normalizer/AbstractObjectNormalizer.php
@@ -399,7 +399,7 @@ private function validateAndDenormalize(string $currentClass, string $attribute,
         $expectedTypes = [];
         foreach ($types as $type) {
             if (null === $data && $type->isNullable()) {
-                return;
+                return null;
             }
 
             if ($type->isCollection() && null !== ($collectionValueType = $type->getCollectionValueType()) && Type::BUILTIN_TYPE_OBJECT === $collectionValueType->getBuiltinType()) {
diff --git a/Normalizer/GetSetMethodNormalizer.php b/Normalizer/GetSetMethodNormalizer.php
@@ -139,6 +139,8 @@ protected function getAttributeValue($object, $attribute, $format = null, array
         if (\is_callable([$object, $haser])) {
             return $object->$haser();
         }
+
+        return null;
     }
 
     /**
diff --git a/Normalizer/PropertyNormalizer.php b/Normalizer/PropertyNormalizer.php
@@ -123,7 +123,7 @@ protected function getAttributeValue($object, $attribute, $format = null, array
         try {
             $reflectionProperty = $this->getReflectionProperty($object, $attribute);
         } catch (\ReflectionException $reflectionException) {
-            return;
+            return null;
         }
 
         // Override visibility
diff --git a/Tests/Normalizer/AbstractObjectNormalizerTest.php b/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -309,6 +309,8 @@ public function denormalize($data, $type, $format = null, array $context = [])
                 return $normalizer->denormalize($data, $type, $format, $context);
             }
         }
+
+        return null;
     }
 
     public function supportsDenormalization($data, $type, $format = null)

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ private function validateAndDenormalize(string $currentClass, string $attribute,`
`399`	`399`	`$expectedTypes = [];`
`400`	`400`	`foreach ($types as $type) {`
`401`	`401`	`if (null === $data && $type->isNullable()) {`
`402`		`- return;`
	`402`	`+ return null;`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`if ($type->isCollection() && null !== ($collectionValueType = $type->getCollectionValueType()) && Type::BUILTIN_TYPE_OBJECT === $collectionValueType->getBuiltinType()) {`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ protected function getAttributeValue($object, $attribute, $format = null, array`
`139`	`139`	`if (\is_callable([$object, $haser])) {`
`140`	`140`	`return $object->$haser();`
`141`	`141`	`}`
	`142`	`+`
	`143`	`+ return null;`
`142`	`144`	`}`
`143`	`145`
`144`	`146`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ protected function getAttributeValue($object, $attribute, $format = null, array`
`123`	`123`	`try {`
`124`	`124`	`$reflectionProperty = $this->getReflectionProperty($object, $attribute);`
`125`	`125`	`} catch (\ReflectionException $reflectionException) {`
`126`		`- return;`
	`126`	`+ return null;`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`// Override visibility`
Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,8 @@ public function denormalize($data, $type, $format = null, array $context = [])`
`309`	`309`	`return $normalizer->denormalize($data, $type, $format, $context);`
`310`	`310`	`}`
`311`	`311`	`}`
	`312`	`+`
	`313`	`+ return null;`
`312`	`314`	`}`
`313`	`315`
`314`	`316`	`public function supportsDenormalization($data, $type, $format = null)`