From 794b4ef09c44faa0ad151433dc0fc2d6745f1adf Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 3 Mar 2012 22:24:51 +0100 Subject: [PATCH] [DDC-1668] Fix problem with the is_int fowards compatibility check. Its not really necesssary anymore, we should remove this code in the future. --- lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index 79b9edc23..de6a4939f 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -142,8 +142,7 @@ class AnnotationDriver implements Driver $classAnnotations = $this->_reader->getClassAnnotations($class); - // Compatibility with Doctrine Common 3.x - if ($classAnnotations && is_int(key($classAnnotations))) { + if ($classAnnotations && is_numeric(key($classAnnotations))) { foreach ($classAnnotations as $annot) { $classAnnotations[get_class($annot)] = $annot; } @@ -438,8 +437,7 @@ class AnnotationDriver implements Driver if ($method->isPublic() && $method->getDeclaringClass()->getName() == $class->name) { $annotations = $this->_reader->getMethodAnnotations($method); - // Compatibility with Doctrine Common 3.x - if ($annotations && is_int(key($annotations))) { + if ($annotations && is_numeric(key($annotations))) { foreach ($annotations as $annot) { $annotations[get_class($annot)] = $annot; } @@ -494,8 +492,7 @@ class AnnotationDriver implements Driver { $classAnnotations = $this->_reader->getClassAnnotations(new \ReflectionClass($className)); - // Compatibility with Doctrine Common 3.x - if ($classAnnotations && is_int(key($classAnnotations))) { + if ($classAnnotations && is_numeric(key($classAnnotations))) { foreach ($classAnnotations as $annot) { if ($annot instanceof \Doctrine\ORM\Mapping\Entity) { return false;