Merge branch '2.7' into 2.8

Tobion · Tobion · commit 964abe489f74 · 2015-10-03T18:42:07.000+02:00
diff --git a/Mapping/Loader/AnnotationLoader.php b/Mapping/Loader/AnnotationLoader.php
@@ -49,7 +49,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
         $attributesMetadata = $classMetadata->getAttributesMetadata();
 
         foreach ($reflectionClass->getProperties() as $property) {
-            if (!isset($attributeMetadata[$property->name])) {
+            if (!isset($attributesMetadata[$property->name])) {
                 $attributesMetadata[$property->name] = new AttributeMetadata($property->name);
                 $classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);
             }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)`
`49`	`49`	`$attributesMetadata = $classMetadata->getAttributesMetadata();`
`50`	`50`
`51`	`51`	`foreach ($reflectionClass->getProperties() as $property) {`
`52`		`- if (!isset($attributeMetadata[$property->name])) {`
	`52`	`+ if (!isset($attributesMetadata[$property->name])) {`
`53`	`53`	`$attributesMetadata[$property->name] = new AttributeMetadata($property->name);`
`54`	`54`	`$classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);`
`55`	`55`	`}`