Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update ORM to Doctrine Common master

  • Loading branch information...
commit b545525e133ffc799edbf0b39e0969a25dea1e34 1 parent bf32125
@beberlei beberlei authored
View
3  lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -20,6 +20,7 @@
namespace Doctrine\ORM\Mapping;
use ReflectionClass, ReflectionProperty;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
/**
* A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@@ -39,7 +40,7 @@
* @author Jonathan H. Wage <jonwage@gmail.com>
* @since 2.0
*/
-class ClassMetadata extends ClassMetadataInfo
+class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
{
/**
* The ReflectionProperty instances of the mapped class.
View
3  lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -19,7 +19,6 @@
namespace Doctrine\ORM\Mapping;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
use Doctrine\DBAL\Types\Type;
use ReflectionClass;
@@ -41,7 +40,7 @@
* @author Jonathan H. Wage <jonwage@gmail.com>
* @since 2.0
*/
-class ClassMetadataInfo implements ClassMetadata
+class ClassMetadataInfo
{
/* The inheritance mapping types */
/**
2  lib/vendor/doctrine-common
@@ -1 +1 @@
-Subproject commit 9c880cf9ae2c14102568520b5ee885b03bda93e4
+Subproject commit ef7382756672d99c92b746aea56f10295edfc96b
Please sign in to comment.
Something went wrong with that request. Please try again.