Merge 2e32c6a into a20bb89

Author: soyuka

src/Annotation/AttributesHydratorTrait.php

@@ -37,7 +37,7 @@ trait AttributesHydratorTrait
     /**
      * @var array
      */
-    public $attributes = [];
+    public $attributes = null;
 
     /**
      * @throws InvalidArgumentException
@@ -55,7 +55,16 @@ private function hydrateAttributes(array $values): void
                 throw new InvalidArgumentException(sprintf('Unknown property "%s" on annotation "%s".', $key, self::class));
             }
 
-            (new \ReflectionProperty($this, $key))->isPublic() ? $this->{$key} = $value : $this->attributes += [Inflector::tableize($key) => $value];
+            if ((new \ReflectionProperty($this, $key))->isPublic()) {
+                $this->{$key} = $value;
+                continue;
+            }
+
+            if (!is_array($this->attributes)) {
+                $this->attributes = [];
+            }
+
+            $this->attributes += [Inflector::tableize($key) => $value];
         }
     }
 }

src/Metadata/Resource/Factory/AnnotationResourceMetadataFactory.php

@@ -85,7 +85,7 @@ private function createMetadata(ApiResource $annotation, ResourceMetadata $paren
                 $annotation->iri,
                 $annotation->itemOperations,
                 $annotation->collectionOperations,
-                $annotation->attributes ?: null,
+                $annotation->attributes,
                 $annotation->subresourceOperations,
                 $annotation->graphql
             );