Fix support for PHP8 union types

nicolas-grekas · nicolas-grekas · commit 2d8a3c8974bf · 2020-06-18T19:59:13.000+02:00
diff --git a/OptionsResolver.php b/OptionsResolver.php
@@ -201,7 +201,7 @@ public function setDefault($option, $value)
                 return $this;
             }
 
-            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()))) {
+            if (isset($params[0]) && null !== ($type = $params[0]->getType()) && self::class === $type->getName() && (!isset($params[1]) || (($type = $params[1]->getType()) instanceof \ReflectionNamedType && Options::class === $type->getName()))) {
                 // Store closure for later evaluation
                 $this->nested[$option][] = $value;
                 $this->defaults[$option] = [];

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 !== ($type = $params[0]->getType()) && self::class === $type->getName() && (!isset($params[1]) \|\| (null !== ($type = $params[1]->getType()) && Options::class === $type->getName()))) {`
	`204`	`+ if (isset($params[0]) && null !== ($type = $params[0]->getType()) && self::class === $type->getName() && (!isset($params[1]) \|\| (($type = $params[1]->getType()) instanceof \ReflectionNamedType && Options::class === $type->getName()))) {`
`205`	`205`	`// Store closure for later evaluation`
`206`	`206`	`$this->nested[$option][] = $value;`
`207`	`207`	`$this->defaults[$option] = [];`