Permalink
Browse files

Update CouchDB to latest master of common changes

  • Loading branch information...
1 parent 86790b3 commit 56f4ce911c9fd7cf32547a9d454141f250c9de54 @beberlei beberlei committed Dec 19, 2011
@@ -193,4 +193,9 @@ public function getClassMetadata()
{
return $this->class;
}
+
+ public function getClassName()
+ {
+ return $this->getDocumentName();
+ }
}
@@ -2,6 +2,8 @@
namespace Doctrine\ODM\CouchDB\Mapping;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
+
/**
* Metadata class
*
@@ -11,7 +13,7 @@
* @author Benjamin Eberlei <kontakt@beberlei.de>
* @author Lukas Kahwe Smith <smith@pooteeweet.org>
*/
-class ClassMetadata extends ClassMetadataInfo
+class ClassMetadata extends ClassMetadataInfo implements IClassMetadata
{
/**
* The ReflectionClass instance of the mapped class.
@@ -2,7 +2,6 @@
namespace Doctrine\ODM\CouchDB\Mapping;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
/**
* Metadata class
@@ -13,7 +12,7 @@
* @author Benjamin Eberlei <kontakt@beberlei.de>
* @author Lukas Kahwe Smith <smith@pooteeweet.org>
*/
-class ClassMetadataInfo implements ClassMetadata
+class ClassMetadataInfo
{
const IDGENERATOR_UUID = 1;
const IDGENERATOR_ASSIGNED = 2;
Submodule doctrine-common updated 41 files
+0 −1 .gitignore
+3 −0 .gitmodules
+6 −0 build.properties
+0 −14 build.properties.dev
+8 −109 build.xml
+3 −3 lib/Doctrine/Common/Annotations/FileCacheReader.php
+1 −1 lib/Doctrine/Common/Cache/ZendDataCache.php
+10 −6 lib/Doctrine/Common/Comparable.php
+5 −5 lib/Doctrine/Common/Persistence/ManagerRegistry.php
+306 −0 lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
+23 −1 lib/Doctrine/Common/Persistence/Mapping/ClassMetadata.php
+1 −1 lib/Doctrine/Common/Persistence/Mapping/ClassMetadataFactory.php
+214 −0 lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
+169 −0 lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php
+178 −0 lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
+69 −0 lib/Doctrine/Common/Persistence/Mapping/Driver/FileLocator.php
+56 −0 lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriver.php
+125 −0 lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php
+70 −0 lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
+131 −0 lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
+198 −0 lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php
+57 −0 lib/Doctrine/Common/Persistence/Mapping/MappingException.php
+10 −1 lib/Doctrine/Common/Persistence/ObjectManager.php
+7 −0 lib/Doctrine/Common/Persistence/ObjectRepository.php
+60 −0 lib/Doctrine/Common/Persistence/Proxy.php
+103 −0 lib/Doctrine/Common/Util/ClassUtils.php
+25 −39 lib/Doctrine/Common/Util/Debug.php
+1 −0 lib/vendor/doctrine-build-common
+14 −0 tests/Doctrine/Tests/Common/Annotations/FileCacheReaderTest.php
+94 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/ChainDriverTest.php
+125 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/ClassMetadataFactoryTest.php
+87 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/DefaultFileLocatorTest.php
+142 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/FileDriverTest.php
+18 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/PHPDriverTest.php
+35 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/StaticPHPDriverTest.php
+86 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/SymfonyFileLocatorTest.php
+3 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/_files/TestEntity.php
+1 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/_files/global.yml
+1 −0 tests/Doctrine/Tests/Common/Persistence/Mapping/_files/stdClass.yml
+100 −0 tests/Doctrine/Tests/Common/Util/ClassUtilsTest.php
+27 −0 tests/Doctrine/Tests/Common/Util/DebugTest.php

0 comments on commit 56f4ce9

Please sign in to comment.