RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-15 23:56:02 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DDC-1668'

Browse Source
This commit is contained in:
Benjamin Eberlei 2012-03-03 22:25:00 +01:00
commit 6195d42778
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View File

@ -142,8 +142,7 @@ class AnnotationDriver implements Driver
$classAnnotations = $this->_reader->getClassAnnotations($class); $classAnnotations = $this->_reader->getClassAnnotations($class);
// Compatibility with Doctrine Common 3.x if ($classAnnotations && is_numeric(key($classAnnotations))) {
if ($classAnnotations && is_int(key($classAnnotations))) {
foreach ($classAnnotations as $annot) { foreach ($classAnnotations as $annot) {
$classAnnotations[get_class($annot)] = $annot; $classAnnotations[get_class($annot)] = $annot;
} }
@ -438,8 +437,7 @@ class AnnotationDriver implements Driver
if ($method->isPublic() && $method->getDeclaringClass()->getName() == $class->name) { if ($method->isPublic() && $method->getDeclaringClass()->getName() == $class->name) {
$annotations = $this->_reader->getMethodAnnotations($method); $annotations = $this->_reader->getMethodAnnotations($method);
// Compatibility with Doctrine Common 3.x if ($annotations && is_numeric(key($annotations))) {
if ($annotations && is_int(key($annotations))) {
foreach ($annotations as $annot) { foreach ($annotations as $annot) {
$annotations[get_class($annot)] = $annot; $annotations[get_class($annot)] = $annot;
} }
@ -494,8 +492,7 @@ class AnnotationDriver implements Driver
{ {
$classAnnotations = $this->_reader->getClassAnnotations(new \ReflectionClass($className)); $classAnnotations = $this->_reader->getClassAnnotations(new \ReflectionClass($className));
// Compatibility with Doctrine Common 3.x if ($classAnnotations && is_numeric(key($classAnnotations))) {
if ($classAnnotations && is_int(key($classAnnotations))) {
foreach ($classAnnotations as $annot) { foreach ($classAnnotations as $annot) {
if ($annot instanceof \Doctrine\ORM\Mapping\Entity) { if ($annot instanceof \Doctrine\ORM\Mapping\Entity) {
return false; return false;