diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

This commit is contained in:
Nicolas Grekas 2018-08-03 14:20:17 +02:00
parent 3b9009e3cc
commit a5516fc08d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
View File

@ -80,9 +80,9 @@ final class PhpDocTypeHelper
/**
* Creates a {@see Type} from a PHPDoc type.
*/
private function createType(DocType $type, bool $nullable): ?Type
private function createType(DocType $type, bool $nullable, string $docType = null): ?Type
{
$docType = (string) $type;
$docType = $docType ?? (string) $type;
if ($type instanceof Collection) {
list($phpType, $class) = $this->getPhpTypeAndClass((string) $type->getFqsen());
@ -109,7 +109,7 @@ final class PhpDocTypeHelper
$collectionValueType = null;
} else {
$collectionKeyType = new Type(Type::BUILTIN_TYPE_INT);
$collectionValueType = $this->createType(substr($docType, 0, -2), $nullable);
$collectionValueType = $this->createType($type, $nullable, substr($docType, 0, -2));
}
return new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, $collectionKeyType, $collectionValueType);