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

Update ORM to Doctrine Common master

Browse source
This commit is contained in:
Benjamin Eberlei 2011-12-19 18:03:53 +01:00
parent bf32125bad
commit b545525e13
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Doctrine/ORM/Mapping/ClassMetadata.php
View file

@ -20,6 +20,7 @@
namespace Doctrine\ORM\Mapping; namespace Doctrine\ORM\Mapping;
use ReflectionClass, ReflectionProperty; use ReflectionClass, ReflectionProperty;
use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
/** /**
* A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata * A <tt>ClassMetadata</tt> instance holds all the object-relational mapping metadata
@ -39,7 +40,7 @@ use ReflectionClass, ReflectionProperty;
* @author Jonathan H. Wage <jonwage@gmail.com> * @author Jonathan H. Wage <jonwage@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class ClassMetadata extends ClassMetadataInfo class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
{ {
/** /**
* The ReflectionProperty instances of the mapped class. * The ReflectionProperty instances of the mapped class.

3
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View file

@ -19,7 +19,6 @@
namespace Doctrine\ORM\Mapping; namespace Doctrine\ORM\Mapping;
use Doctrine\Common\Persistence\Mapping\ClassMetadata;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use ReflectionClass; use ReflectionClass;
@ -41,7 +40,7 @@ use ReflectionClass;
* @author Jonathan H. Wage <jonwage@gmail.com> * @author Jonathan H. Wage <jonwage@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class ClassMetadataInfo implements ClassMetadata class ClassMetadataInfo
{ {
/* The inheritance mapping types */ /* The inheritance mapping types */
/** /**

2
lib/vendor/doctrine-common vendored

@ -1 +1 @@
Subproject commit 9c880cf9ae2c14102568520b5ee885b03bda93e4 Subproject commit ef7382756672d99c92b746aea56f10295edfc96b