RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-04 20:03:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.2'

Browse Source
This commit is contained in:
Benjamin Eberlei 2012-01-09 08:04:44 +01:00
commit 773fbd9edb
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,6 +134,11 @@ class AnnotationDriver implements Driver
public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
{
$class = $metadata->getReflectionClass();
if (!$class) {
// this happens when running annotation driver in combination with
// static reflection services. This is not the nicest fix
$class = new \ReflectionClass($metadata->name);
}
$classAnnotations = $this->_reader->getClassAnnotations($class);

2
lib/vendor/doctrine-build-common vendored

@ -1 +1 @@
Subproject commit 5812b7acdc962196140e6b9f7a4758fb6d6f4933
Subproject commit c9ff83d716d56a82b3c15733ea7d180b8619d9d9

2
lib/vendor/doctrine-common vendored

@ -1 +1 @@
Subproject commit cc04744bcf5a4743c46fae0487ac7a093a722856
Subproject commit 17e774007b98beb2e253e645260e0f9c32f4c936

2
lib/vendor/doctrine-dbal vendored

@ -1 +1 @@
Subproject commit 29b714b7fe72641d749ae90324a5759853fe09b0
Subproject commit 3dc1b22e12368bc3bd5aaa72a7d4f75f61273223