feature #23617 [PropertyInfo] Add hassers for accessors prefixes (sebdec)

fabpot · fabpot · commit 89d1b6503717 · 2018-02-07T07:38:04.000+01:00
This PR was submitted for the 3.3 branch but it was squashed and merged into the 4.1-dev branch instead (closes #23617). Discussion ---------- [PropertyInfo] Add hassers for accessors prefixes | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | None | License | MIT | Doc PR | - In the component PropertyInfo In the class ReflectionExtractor Add hassers in the accessors prefixes Because I think it's common to have readable properties with method like this: hasChildren() Commits ------- 03bce5e [PropertyInfo] Add hassers for accessors prefixes
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -34,7 +34,7 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
     /**
      * @internal
      */
-    public static $defaultAccessorPrefixes = array('is', 'can', 'get');
+    public static $defaultAccessorPrefixes = array('is', 'can', 'get', 'has');
 
     /**
      * @internal
@@ -178,7 +178,7 @@ private function extractFromAccessor(string $class, string $property): ?array
             return array($this->extractFromReflectionType($reflectionType));
         }
 
-        if (in_array($prefix, array('is', 'can'))) {
+        if (in_array($prefix, array('is', 'can', 'has'))) {
             return array(new Type(Type::BUILTIN_TYPE_BOOL));
         }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
@@ -88,7 +88,8 @@ 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('g', array(new Type(Type::BUILTIN_TYPE_BOOL, true)), null, null),
+            array('array', 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
@@ -40,7 +40,7 @@ public function testGetProperties()
                 'collection',
                 'B',
                 'Guid',
-                'g',
+                'array',
                 'emptyVar',
                 'foo',
                 'foo2',
@@ -56,6 +56,7 @@ public function testGetProperties()
                 'd',
                 'e',
                 'f',
+                'g',
             ),
             $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')
         );
@@ -196,10 +197,12 @@ public function getReadableProperties()
             array('d', true),
             array('e', false),
             array('f', false),
+            array('g', true),
             array('Id', true),
             array('id', true),
             array('Guid', true),
             array('guid', false),
+            array('guid', false),
         );
     }
 
@@ -226,6 +229,7 @@ public function getWritableProperties()
             array('d', false),
             array('e', true),
             array('f', true),
+            array('g', false),
             array('Id', false),
             array('Guid', true),
             array('guid', false),
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -66,7 +66,7 @@ class Dummy extends ParentDummy
      *
      * @var array|null
      */
-    public $g;
+    public $array;
 
     /**
      * This should not be removed.
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php
@@ -75,4 +75,11 @@ public function addE($e)
     public function removeF(\DateTime $f)
     {
     }
+
+    /**
+     * @return bool|null
+     */
+    public function hasG()
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp`
`34`	`34`	`/**`
`35`	`35`	`* @internal`
`36`	`36`	`*/`
`37`		`- public static $defaultAccessorPrefixes = array('is', 'can', 'get');`
	`37`	`+ public static $defaultAccessorPrefixes = array('is', 'can', 'get', 'has');`
`38`	`38`
`39`	`39`	`/**`
`40`	`40`	`* @internal`
`@@ -178,7 +178,7 @@ private function extractFromAccessor(string $class, string $property): ?array`
`178`	`178`	`return array($this->extractFromReflectionType($reflectionType));`
`179`	`179`	`}`
`180`	`180`
`181`		`- if (in_array($prefix, array('is', 'can'))) {`
	`181`	`+ if (in_array($prefix, array('is', 'can', 'has'))) {`
`182`	`182`	`return array(new Type(Type::BUILTIN_TYPE_BOOL));`
`183`	`183`	`}`
`184`	`184`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class Dummy extends ParentDummy`
`66`	`66`	`*`
`67`	`67`	`* @var array\|null`
`68`	`68`	`*/`
`69`		`- public $g;`
	`69`	`+ public $array;`
`70`	`70`
`71`	`71`	`/**`
`72`	`72`	`* This should not be removed.`
Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,11 @@ public function addE($e)`
`75`	`75`	`public function removeF(\DateTime $f)`
`76`	`76`	`{`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ /**`
	`80`	`+ * @return bool\|null`
	`81`	`+ */`
	`82`	`+ public function hasG()`
	`83`	`+ {`
	`84`	`+ }`
`78`	`85`	`}`