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

[DDC-1937] Fix bug with apc and annotation caching using a workaround.

Browse Source
This commit is contained in:
Benjamin Eberlei 2012-07-29 11:56:41 +02:00
parent e8d3fc73ff
commit 00a5f18544
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,12 @@ class AnnotationDriver extends AbstractAnnotationDriver
$classAnnotations = $this->reader->getClassAnnotations($class); $classAnnotations = $this->reader->getClassAnnotations($class);
if ($classAnnotations && is_numeric(key($classAnnotations))) { if ($classAnnotations) {
foreach ($classAnnotations as $annot) { foreach ($classAnnotations as $key => $annot) {
if ( ! is_numeric($key)) {
continue;
}
$classAnnotations[get_class($annot)] = $annot; $classAnnotations[get_class($annot)] = $annot;
} }
} }
@ -456,8 +460,11 @@ class AnnotationDriver extends AbstractAnnotationDriver
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);
if ($annotations && is_numeric(key($annotations))) { if ($annotations) {
foreach ($annotations as $annot) { foreach ($annotations as $key => $annot) {
if ( ! is_numeric($key)) {
continue;
}
$annotations[get_class($annot)] = $annot; $annotations[get_class($annot)] = $annot;
} }
} }