bug #33626 [PropertyInfo] ensure compatibility with type resolver 0.5 (xabbuh)

fabpot · fabpot · commit 6fad4f1215b3 · 2019-09-18T16:55:47.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [PropertyInfo] ensure compatibility with type resolver 0.5 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | same as #33588 but for the `3.4` branch Commits ------- 2d708b3 ensure compatibility with type resolver 0.5
diff --git a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
@@ -55,7 +55,14 @@ public function getTypes(DocType $varType)
 
         $varTypes = [];
         for ($typeIndex = 0; $varType->has($typeIndex); ++$typeIndex) {
-            $varTypes[] = (string) $varType->get($typeIndex);
+            $nestedVarType = $varType->get($typeIndex);
+
+            if ($nestedVarType instanceof Nullable) {
+                $varTypes[] = (string) $nestedVarType->getActualType();
+                $nullable = true;
+            } else {
+                $varTypes[] = (string) $nestedVarType;
+            }
         }
 
         // If null is present, all types are nullable
