From 43d8466fa99f0b9057b59c83a9d9c6b5d5c26c23 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 2 Jul 2011 19:48:43 +0200
Subject: [PATCH] Update annotation handling in AnnotationDriver to work with
AnnotationRegistry and bump common dependency
---
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 4 ++--
lib/vendor/doctrine-common | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
index e30b9bf01..cb30e1cbf 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -21,11 +21,10 @@ namespace Doctrine\ORM\Mapping\Driver;
use Doctrine\Common\Cache\ArrayCache,
Doctrine\Common\Annotations\AnnotationReader,
+ Doctrine\Common\Annotations\AnnotationRegistry,
Doctrine\ORM\Mapping\ClassMetadataInfo,
Doctrine\ORM\Mapping\MappingException;
-require __DIR__ . '/DoctrineAnnotations.php';
-
/**
* The AnnotationDriver reads the mapping metadata from docblock annotations.
*
@@ -73,6 +72,7 @@ class AnnotationDriver implements Driver
public function __construct($reader, $paths = null)
{
$this->_reader = $reader;
+ AnnotationRegistry::registerFile(__DIR__ . '/DoctrineAnnotations.php');
if ($paths) {
$this->addPaths((array) $paths);
}
diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common
index 6a74bf90f..6aab4ffd6 160000
--- a/lib/vendor/doctrine-common
+++ b/lib/vendor/doctrine-common
@@ -1 +1 @@
-Subproject commit 6a74bf90f5fcf6b404f49aee6c11b78fbd568c6c
+Subproject commit 6aab4ffd67baa5a8b7342c986616fb07a399c510