Merge branch 'DDC-1937' into 2.2

beberlei · beberlei · commit 09d900f89f7b · 2012-07-29T11:57:37.000+02:00
diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -142,8 +142,12 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
 
         $classAnnotations = $this->_reader->getClassAnnotations($class);
 
-        if ($classAnnotations && is_numeric(key($classAnnotations))) {
-            foreach ($classAnnotations as $annot) {
+        if ($classAnnotations) {
+            foreach ($classAnnotations as $key => $annot) {
+                if ( ! is_numeric($key)) {
+                    continue;
+                }
+
                 $classAnnotations[get_class($annot)] = $annot;
             }
         }
@@ -432,8 +436,11 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
                 if ($method->isPublic() && $method->getDeclaringClass()->getName() == $class->name) {
                     $annotations = $this->_reader->getMethodAnnotations($method);
 
-                    if ($annotations && is_numeric(key($annotations))) {
-                        foreach ($annotations as $annot) {
+                    if ($annotations) {
+                        foreach ($annotations as $key => $annot) {
+                            if ( ! is_numeric($key)) {
+                                continue;
+                            }
                             $annotations[get_class($annot)] = $annot;
                         }
                     }
