RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Update annotation handling in AnnotationDriver to work with AnnotationRegistry and bump common dependency

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-07-02 19:48:43 +02:00
parent 5299bd788f
commit 43d8466fa9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,11 +21,10 @@ namespace Doctrine\ORM\Mapping\Driver;
use Doctrine\Common\Cache\ArrayCache, use Doctrine\Common\Cache\ArrayCache,
Doctrine\Common\Annotations\AnnotationReader, Doctrine\Common\Annotations\AnnotationReader,
Doctrine\Common\Annotations\AnnotationRegistry,
Doctrine\ORM\Mapping\ClassMetadataInfo, Doctrine\ORM\Mapping\ClassMetadataInfo,
Doctrine\ORM\Mapping\MappingException; Doctrine\ORM\Mapping\MappingException;
require __DIR__ . '/DoctrineAnnotations.php';
/** /**
* The AnnotationDriver reads the mapping metadata from docblock annotations. * The AnnotationDriver reads the mapping metadata from docblock annotations.
* *
@ -73,6 +72,7 @@ class AnnotationDriver implements Driver
public function __construct($reader, $paths = null) public function __construct($reader, $paths = null)
{ {
$this->_reader = $reader; $this->_reader = $reader;
AnnotationRegistry::registerFile(__DIR__ . '/DoctrineAnnotations.php');
if ($paths) { if ($paths) {
$this->addPaths((array) $paths); $this->addPaths((array) $paths);
} }

2
lib/vendor/doctrine-common vendored

@ -1 +1 @@
Subproject commit 6a74bf90f5fcf6b404f49aee6c11b78fbd568c6c Subproject commit 6aab4ffd67baa5a8b7342c986616fb07a399c510