ticket_686 : Deal it with Has Method for the Normalizer/Denormalizer

jsamouh · jsamouh · commit b6fa50bc4bc2 · 2017-06-30T10:33:54.000-04:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -87,7 +87,8 @@ private function isGetMethod(\ReflectionMethod $method)
             !$method->isStatic() &&
             (
                 ((0 === strpos($method->name, 'get') && 3 < $methodLength) ||
-                (0 === strpos($method->name, 'is') && 2 < $methodLength)) &&
+                (0 === strpos($method->name, 'is') && 2 < $methodLength) ||
+                (0 === strpos($method->name, 'has') && 3 < $methodLength)) &&
                 0 === $method->getNumberOfRequiredParameters()
             )
         ;
@@ -133,6 +134,11 @@ protected function getAttributeValue($object, $attribute, $format = null, array
         if (is_callable(array($object, $isser))) {
             return $object->$isser();
         }
+
+        $haser = 'has'.$ucfirsted;
+        if (is_callable(array($object, $haser))) {
+            return $object->$haser();
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -497,6 +497,23 @@ public function testPrivateSetter()
         $this->assertEquals('bar', $obj->getFoo());
     }
 
+    public function testHasGetterDenormalize()
+    {
+        $obj = $this->normalizer->denormalize(array('foo' => true), __NAMESPACE__.'\ObjectWithHasGetterDummy');
+        $this->assertEquals(true, $obj->hasFoo());
+    }
+
+    public function testHasGetterNormalize()
+    {
+        $obj = new ObjectWithHasGetterDummy();
+        $obj->setFoo(true);
+
+        $this->assertEquals(
+            array('foo' => true),
+            $this->normalizer->normalize($obj, 'any')
+        );
+    }
+
     public function testMaxDepth()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
@@ -807,3 +824,18 @@ public static function setFoo($foo)
         self::$foo = $foo;
     }
 }
+
+class ObjectWithHasGetterDummy
+{
+    private $foo = null;
+
+    public function setFoo($foo)
+    {
+        $this->foo = $foo;
+    }
+
+    public function hasFoo()
+    {
+        return $this->foo;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ private function isGetMethod(\ReflectionMethod $method)`
`87`	`87`	`!$method->isStatic() &&`
`88`	`88`	`(`
`89`	`89`	`((0 === strpos($method->name, 'get') && 3 < $methodLength) \|\|`
`90`		`- (0 === strpos($method->name, 'is') && 2 < $methodLength)) &&`
	`90`	`+ (0 === strpos($method->name, 'is') && 2 < $methodLength) \|\|`
	`91`	`+ (0 === strpos($method->name, 'has') && 3 < $methodLength)) &&`
`91`	`92`	`0 === $method->getNumberOfRequiredParameters()`
`92`	`93`	`)`
`93`	`94`	`;`
`@@ -133,6 +134,11 @@ protected function getAttributeValue($object, $attribute, $format = null, array`
`133`	`134`	`if (is_callable(array($object, $isser))) {`
`134`	`135`	`return $object->$isser();`
`135`	`136`	`}`
	`137`	`+`
	`138`	`+ $haser = 'has'.$ucfirsted;`
	`139`	`+ if (is_callable(array($object, $haser))) {`
	`140`	`+ return $object->$haser();`
	`141`	`+ }`
`136`	`142`	`}`
`137`	`143`
`138`	`144`	`/**`