Merge branch '4.3' into 4.4

* 4.3: ensure compatibility with type resolver 0.5
2019-09-16 10:45:43 +02:00 · 2019-09-16 10:45:43 +02:00 · c7911ae92f
commit c7911ae92f
parent 9a019d7201 bafe10adc3
1 changed files with 5 additions and 0 deletions
--- a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
+++ b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
@ -64,6 +64,11 @@ final class PhpDocTypeHelper
                continue;
            }

+            if ($type instanceof Nullable) {
+                $nullable = true;
+                $type = $type->getActualType();
+            }
+
            $varTypes[] = $type;
        }