From 4deeb23af05d43774901ceac6fb5bed7f3871fac Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 3 Jan 2012 21:56:04 +0100 Subject: [PATCH 1/5] Update dependencies --- lib/vendor/doctrine-build-common | 2 +- lib/vendor/doctrine-common | 2 +- lib/vendor/doctrine-dbal | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/vendor/doctrine-build-common b/lib/vendor/doctrine-build-common index 5812b7acd..c9ff83d71 160000 --- a/lib/vendor/doctrine-build-common +++ b/lib/vendor/doctrine-build-common @@ -1 +1 @@ -Subproject commit 5812b7acdc962196140e6b9f7a4758fb6d6f4933 +Subproject commit c9ff83d716d56a82b3c15733ea7d180b8619d9d9 diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index cc04744bc..17e774007 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit cc04744bcf5a4743c46fae0487ac7a093a722856 +Subproject commit 17e774007b98beb2e253e645260e0f9c32f4c936 diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal index 29b714b7f..3dc1b22e1 160000 --- a/lib/vendor/doctrine-dbal +++ b/lib/vendor/doctrine-dbal @@ -1 +1 @@ -Subproject commit 29b714b7fe72641d749ae90324a5759853fe09b0 +Subproject commit 3dc1b22e12368bc3bd5aaa72a7d4f75f61273223 From 8d3d604ed308bcda1249d716e9da691f539ee62b Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 3 Jan 2012 22:27:03 +0100 Subject: [PATCH 2/5] Release 2.2.0-BETA2 --- composer.json | 2 +- lib/Doctrine/ORM/Version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8f570e200..c3c4d7b05 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "doctrine/orm", - "type": "library", + "type": "library","version":"2.2.0-BETA2", "description": "Object-Relational-Mapper for PHP", "keywords": ["orm", "database"], "homepage": "http://www.doctrine-project.org", diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index e8124cd45..787cf9fe1 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.2.0-DEV'; + const VERSION = '2.2.0-BETA2'; /** * Compares a Doctrine version with the current one. From d34c39555d356e771452a6f397a4cb1146594304 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 3 Jan 2012 22:27:03 +0100 Subject: [PATCH 3/5] Bump dev version to 2.2.0 --- composer.json | 2 +- lib/Doctrine/ORM/Version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c3c4d7b05..8f570e200 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "doctrine/orm", - "type": "library","version":"2.2.0-BETA2", + "type": "library", "description": "Object-Relational-Mapper for PHP", "keywords": ["orm", "database"], "homepage": "http://www.doctrine-project.org", diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index 787cf9fe1..e8124cd45 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.2.0-BETA2'; + const VERSION = '2.2.0-DEV'; /** * Compares a Doctrine version with the current one. From e16803de618ef0b94b1fa0917bf0fefff23e07de Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 9 Jan 2012 08:02:53 +0100 Subject: [PATCH 4/5] [doctrine/common-GH-92] Fixing notice when annotation driver is used in combination with static reflection. --- lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index bcd453508..c8b53fe94 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -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($class->name); + } $classAnnotations = $this->_reader->getClassAnnotations($class); From 0014afe74694fb668898725a67a753c82731ccec Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 9 Jan 2012 08:04:21 +0100 Subject: [PATCH 5/5] Fix Typo --- lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index c8b53fe94..f11331ffa 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -137,7 +137,7 @@ class AnnotationDriver implements Driver if (!$class) { // this happens when running annotation driver in combination with // static reflection services. This is not the nicest fix - $class = new \ReflectionClass($class->name); + $class = new \ReflectionClass($metadata->name); } $classAnnotations = $this->_reader->getClassAnnotations($class);