Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update ORM to Doctrine Common master

  • Loading branch information...
commit b545525e133ffc799edbf0b39e0969a25dea1e34 1 parent bf32125
Benjamin Eberlei beberlei authored
3  lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -20,6 +20,7 @@
20 20 namespace Doctrine\ORM\Mapping;
21 21
22 22 use ReflectionClass, ReflectionProperty;
  23 +use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
23 24
24 25 /**
25 26 * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@@ -39,7 +40,7 @@
39 40 * @author Jonathan H. Wage <jonwage@gmail.com>
40 41 * @since 2.0
41 42 */
42   -class ClassMetadata extends ClassMetadataInfo
  43 +class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
43 44 {
44 45 /**
45 46 * The ReflectionProperty instances of the mapped class.
3  lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -19,7 +19,6 @@
19 19
20 20 namespace Doctrine\ORM\Mapping;
21 21
22   -use Doctrine\Common\Persistence\Mapping\ClassMetadata;
23 22 use Doctrine\DBAL\Types\Type;
24 23 use ReflectionClass;
25 24
@@ -41,7 +40,7 @@
41 40 * @author Jonathan H. Wage <jonwage@gmail.com>
42 41 * @since 2.0
43 42 */
44   -class ClassMetadataInfo implements ClassMetadata
  43 +class ClassMetadataInfo
45 44 {
46 45 /* The inheritance mapping types */
47 46 /**
2  lib/vendor/doctrine-common
... ... @@ -1 +1 @@
1   -Subproject commit 9c880cf9ae2c14102568520b5ee885b03bda93e4
  1 +Subproject commit ef7382756672d99c92b746aea56f10295edfc96b

0 comments on commit b545525

Please sign in to comment.
Something went wrong with that request. Please try again.