Merge branch '4.3' into 4.4

fabpot · fabpot · commit c7911ae92fcd · 2019-09-16T10:45:43.000+02:00
* 4.3:
  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
@@ -64,6 +64,11 @@ public function getTypes(DocType $varType): array
                 continue;
             }
 
+            if ($type instanceof Nullable) {
+                $nullable = true;
+                $type = $type->getActualType();
+            }
+
             $varTypes[] = $type;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,11 @@ public function getTypes(DocType $varType): array`
`64`	`64`	`continue;`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ if ($type instanceof Nullable) {`
	`68`	`+ $nullable = true;`
	`69`	`+ $type = $type->getActualType();`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`$varTypes[] = $type;`
`68`	`73`	`}`
`69`	`74`