[Serializer] Supports hassers and setters for groups annotations

dunglas · dunglas · commit 9c87eccf9f87 · 2015-04-02T22:29:07.000+02:00
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php
@@ -54,7 +54,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
                 $classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);
             }
 
-            if ($property->getDeclaringClass()->name == $className) {
+            if ($property->getDeclaringClass()->name === $className) {
                 foreach ($this->reader->getPropertyAnnotations($property) as $groups) {
                     if ($groups instanceof Groups) {
                         foreach ($groups->getGroups() as $group) {
@@ -68,10 +68,10 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
         }
 
         foreach ($reflectionClass->getMethods() as $method) {
-            if ($method->getDeclaringClass()->name == $className) {
+            if ($method->getDeclaringClass()->name === $className) {
                 foreach ($this->reader->getMethodAnnotations($method) as $groups) {
                     if ($groups instanceof Groups) {
-                        if (preg_match('/^(get|is)(.+)$/i', $method->name, $matches)) {
+                        if (preg_match('/^(get|is|has|set)(.+)$/i', $method->name, $matches)) {
                             $attributeName = lcfirst($matches[2]);
 
                             if (isset($attributesMetadata[$attributeName])) {
@@ -85,7 +85,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
                                 $attributeMetadata->addGroup($group);
                             }
                         } else {
-                            throw new MappingException(sprintf('Groups on "%s::%s" cannot be added. Groups can only be added on methods beginning with "get" or "is".', $className, $method->name));
+                            throw new MappingException(sprintf('Groups on "%s::%s" cannot be added. Groups can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
                         }
                     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/GroupDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/GroupDummy.php
@@ -22,18 +22,21 @@ class GroupDummy extends GroupDummyParent implements GroupDummyInterface
      * @Groups({"a"})
      */
     private $foo;
-    /**
-     * @Groups({"b", "c"})
-     */
     protected $bar;
     private $fooBar;
     private $symfony;
 
+    /**
+     * @Groups({"b"})
+     */
     public function setBar($bar)
     {
         $this->bar = $bar;
     }
 
+    /**
+     * @Groups({"c"})
+     */
     public function getBar()
     {
         return $this->bar;
@@ -57,7 +60,7 @@ public function setFooBar($fooBar)
     /**
      * @Groups({"a", "b"})
      */
-    public function getFooBar()
+    public function isFooBar()
     {
         return $this->fooBar;
     }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)`
`54`	`54`	`$classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);`
`55`	`55`	`}`
`56`	`56`
`57`		`- if ($property->getDeclaringClass()->name == $className) {`
	`57`	`+ if ($property->getDeclaringClass()->name === $className) {`
`58`	`58`	`foreach ($this->reader->getPropertyAnnotations($property) as $groups) {`
`59`	`59`	`if ($groups instanceof Groups) {`
`60`	`60`	`foreach ($groups->getGroups() as $group) {`
`@@ -68,10 +68,10 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`foreach ($reflectionClass->getMethods() as $method) {`
`71`		`- if ($method->getDeclaringClass()->name == $className) {`
	`71`	`+ if ($method->getDeclaringClass()->name === $className) {`
`72`	`72`	`foreach ($this->reader->getMethodAnnotations($method) as $groups) {`
`73`	`73`	`if ($groups instanceof Groups) {`
`74`		`- if (preg_match('/^(get\|is)(.+)$/i', $method->name, $matches)) {`
	`74`	`+ if (preg_match('/^(get\|is\|has\|set)(.+)$/i', $method->name, $matches)) {`
`75`	`75`	`$attributeName = lcfirst($matches[2]);`
`76`	`76`
`77`	`77`	`if (isset($attributesMetadata[$attributeName])) {`
`@@ -85,7 +85,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)`
`85`	`85`	`$attributeMetadata->addGroup($group);`
`86`	`86`	`}`
`87`	`87`	`} else {`
`88`		`- throw new MappingException(sprintf('Groups on "%s::%s" cannot be added. Groups can only be added on methods beginning with "get" or "is".', $className, $method->name));`
	`88`	`+ throw new MappingException(sprintf('Groups on "%s::%s" cannot be added. Groups can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`