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

support nullable array or collection

Browse Source
This commit is contained in:
Arthur de Moulins 2017-04-03 11:21:18 +02:00
parent 994e90c129
commit 74ee588924
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
View File

@ -242,7 +242,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
* @param string $ucFirstProperty
* @param int $type
*
* @return DocBlock|null
* @return array|null
*/
private function getDocBlockFromMethod($class, $ucFirstProperty, $type)
{
@ -337,10 +337,10 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
$collectionValueType = null;
} else {
$collectionKeyType = new Type(Type::BUILTIN_TYPE_INT);
$collectionValueType = new Type($phpType, false, $class);
$collectionValueType = new Type($phpType, $nullable, $class);
}
return new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, $collectionKeyType, $collectionValueType);
return new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, $collectionKeyType, $collectionValueType);
}
return new Type($phpType, $nullable, $class);

1
src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
View File

@ -68,6 +68,7 @@ class PhpDocExtractorTest extends TestCase
array('d', array(new Type(Type::BUILTIN_TYPE_BOOL)), null, null),
array('e', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_RESOURCE))), null, null),
array('f', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime'))), null, null),
array('g', array(new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)), 'Nullable array.', null),
array('donotexist', null, null, null),
array('staticGetter', null, null, null),
array('staticSetter', null, null, null),

1
src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
View File

@ -38,6 +38,7 @@ class ReflectionExtractorTest extends TestCase
'parent',
'collection',
'B',
'g',
'foo',
'foo2',
'foo3',

7
src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
View File

@ -51,6 +51,13 @@ class Dummy extends ParentDummy
*/
public $B;
/**
* Nullable array.
*
* @var array|null
*/
public $g;
public static function getStatic()
{
}