support nullable array or collection

4rthem · 4rthem · commit 74ee588924cf · 2017-04-03T11:21:18.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -242,7 +242,7 @@ private function getDocBlockFromProperty($class, $property)
      * @param string $ucFirstProperty
      * @param int    $type
      *
-     * @return DocBlock|null
+     * @return array|null
      */
     private function getDocBlockFromMethod($class, $ucFirstProperty, $type)
     {
@@ -337,10 +337,10 @@ private function createType($docType, $nullable)
                 $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);
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
@@ -68,6 +68,7 @@ public function typesProvider()
             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),
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
@@ -38,6 +38,7 @@ public function testGetProperties()
                 'parent',
                 'collection',
                 'B',
+                'g',
                 'foo',
                 'foo2',
                 'foo3',
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -51,6 +51,13 @@ class Dummy extends ParentDummy
      */
     public $B;
 
+    /**
+     * Nullable array.
+     *
+     * @var array|null
+     */
+    public $g;
+
     public static function getStatic()
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ private function getDocBlockFromProperty($class, $property)`
`242`	`242`	`* @param string $ucFirstProperty`
`243`	`243`	`* @param int $type`
`244`	`244`	`*`
`245`		`- * @return DocBlock\|null`
	`245`	`+ * @return array\|null`
`246`	`246`	`*/`
`247`	`247`	`private function getDocBlockFromMethod($class, $ucFirstProperty, $type)`
`248`	`248`	`{`
`@@ -337,10 +337,10 @@ private function createType($docType, $nullable)`
`337`	`337`	`$collectionValueType = null;`
`338`	`338`	`} else {`
`339`	`339`	`$collectionKeyType = new Type(Type::BUILTIN_TYPE_INT);`
`340`		`- $collectionValueType = new Type($phpType, false, $class);`
	`340`	`+ $collectionValueType = new Type($phpType, $nullable, $class);`
`341`	`341`	`}`
`342`	`342`
`343`		`- return new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, $collectionKeyType, $collectionValueType);`
	`343`	`+ return new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, $collectionKeyType, $collectionValueType);`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`return new Type($phpType, $nullable, $class);`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,13 @@ class Dummy extends ParentDummy`
`51`	`51`	`*/`
`52`	`52`	`public $B;`
`53`	`53`
	`54`	`+ /**`
	`55`	`+ * Nullable array.`
	`56`	`+ *`
	`57`	`+ * @var array\|null`
	`58`	`+ */`
	`59`	`+ public $g;`
	`60`	`+`
`54`	`61`	`public static function getStatic()`
`55`	`62`	`{`
`56`	`63`	`}`