bug #36921 [OptionsResolver][Serializer] Remove calls to deprecated ReflectionParameter::getClass() (derrabus)

nicolas-grekas · nicolas-grekas · commit 1a21a7582ef9 · 2020-05-23T14:48:29.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [OptionsResolver][Serializer] Remove calls to deprecated ReflectionParameter::getClass() | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #36872 | License | MIT | Doc PR | N/A Following #36891, this PR removes the remaining calls to `ReflectionParameter::getClass()` from the 4.4 branch. Commits ------- 1575d85 Remove calls to deprecated ReflectionParameter::getClass().
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -201,7 +201,7 @@ public function setDefault($option, $value)
                 return $this;
             }
 
-            if (isset($params[0]) && null !== ($class = $params[0]->getClass()) && self::class === $class->name && (!isset($params[1]) || (null !== ($class = $params[1]->getClass()) && Options::class === $class->name))) {
+            if (isset($params[0]) && null !== ($type = $params[0]->getType()) && self::class === $type->getName() && (!isset($params[1]) || (null !== ($type = $params[1]->getType()) && Options::class === $type->getName()))) {
                 // Store closure for later evaluation
                 $this->nested[$option][] = $value;
                 $this->defaults[$option] = [];
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -522,9 +522,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
     protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, $parameterName, $parameterData, array $context, $format = null)
     {
         try {
-            if (\PHP_VERSION_ID < 70100 && null !== $parameterClass = $parameter->getClass()) {
-                $parameterClass = $parameterClass->name;
-            } elseif (\PHP_VERSION_ID >= 70100 && $parameter->hasType() && ($parameterType = $parameter->getType()) && !$parameterType->isBuiltin()) {
+            if ($parameter->hasType() && ($parameterType = $parameter->getType()) && !$parameterType->isBuiltin()) {
                 $parameterClass = $parameterType->getName();
                 new \ReflectionClass($parameterClass); // throws a \ReflectionException if the class doesn't exist
             } else {

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public function setDefault($option, $value)`
`201`	`201`	`return $this;`
`202`	`202`	`}`
`203`	`203`
`204`		`- if (isset($params[0]) && null !== ($class = $params[0]->getClass()) && self::class === $class->name && (!isset($params[1]) \|\| (null !== ($class = $params[1]->getClass()) && Options::class === $class->name))) {`
	`204`	`+ if (isset($params[0]) && null !== ($type = $params[0]->getType()) && self::class === $type->getName() && (!isset($params[1]) \|\| (null !== ($type = $params[1]->getType()) && Options::class === $type->getName()))) {`
`205`	`205`	`// Store closure for later evaluation`
`206`	`206`	`$this->nested[$option][] = $value;`
`207`	`207`	`$this->defaults[$option] = [];`