@@ -21,11 +21,6 @@ |
||
| 21 | 21 | |
| 22 | 22 | use Doctrine\Common\Cache\Cache; |
| 23 | 23 | use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; |
| 24 | - |
|
| 25 | -use Doctrine\CouchDB\HTTP\Client; |
|
| 26 | -use Doctrine\CouchDB\HTTP\SocketClient; |
|
| 27 | -use Doctrine\CouchDB\HTTP\LoggingClient; |
|
| 28 | - |
|
| 29 | 24 | use Doctrine\ODM\CouchDB\Mapping\MetadataResolver\MetadataResolver; |
| 30 | 25 | use Doctrine\ODM\CouchDB\Mapping\MetadataResolver\DoctrineResolver; |
| 31 | 26 | use Doctrine\ODM\CouchDB\Migrations\DocumentMigration; |
@@ -2,10 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Doctrine\ODM\CouchDB\Mapping; |
| 4 | 4 | |
| 5 | -use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata, |
|
| 6 | - Doctrine\Instantiator\Instantiator, |
|
| 7 | - ReflectionClass, |
|
| 8 | - ReflectionProperty; |
|
| 5 | +use Doctrine\Common\Persistence\Mapping\ClassMetadata as IClassMetadata; |
|
| 6 | +use Doctrine\Instantiator\Instantiator; |
|
| 7 | +use ReflectionClass; |
|
| 8 | +use ReflectionProperty; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Metadata class |
@@ -19,14 +19,12 @@ |
||
| 19 | 19 | |
| 20 | 20 | namespace Doctrine\ODM\CouchDB\Mapping; |
| 21 | 21 | |
| 22 | -use Doctrine\ODM\CouchDB\DocumentManager, |
|
| 23 | - Doctrine\ODM\CouchDB\CouchDBException, |
|
| 24 | - Doctrine\ODM\CouchDB\Mapping\ClassMetadata, |
|
| 25 | - Doctrine\Common\Persistence\Mapping\Driver\MappingDriver, |
|
| 26 | - Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface, |
|
| 27 | - Doctrine\Common\Persistence\Mapping\ReflectionService, |
|
| 28 | - Doctrine\Common\Persistence\Mapping\RuntimeReflectionService, |
|
| 29 | - Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory; |
|
| 22 | +use Doctrine\ODM\CouchDB\DocumentManager; |
|
| 23 | +use Doctrine\ODM\CouchDB\Mapping\ClassMetadata; |
|
| 24 | +use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; |
|
| 25 | +use Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface; |
|
| 26 | +use Doctrine\Common\Persistence\Mapping\ReflectionService; |
|
| 27 | +use Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory; |
|
| 30 | 28 | |
| 31 | 29 | /** |
| 32 | 30 | * The ClassMetadataFactory is used to create ClassMetadata objects that contain all the |
@@ -19,13 +19,10 @@ |
||
| 19 | 19 | |
| 20 | 20 | namespace Doctrine\ODM\CouchDB\Mapping\Driver; |
| 21 | 21 | |
| 22 | -use Doctrine\Common\Annotations\AnnotationReader, |
|
| 23 | - Doctrine\Common\Annotations\AnnotationRegistry, |
|
| 24 | - Doctrine\Common\Annotations\Reader, |
|
| 25 | - Doctrine\Common\Persistence\Mapping\ClassMetadata, |
|
| 26 | - Doctrine\Common\Persistence\Mapping\Driver\AnnotationDriver as AbstractAnnotationDriver, |
|
| 27 | - Doctrine\ODM\CouchDB\Mapping\Annotations as ODM, |
|
| 28 | - Doctrine\ODM\CouchDB\Mapping\MappingException; |
|
| 22 | +use Doctrine\Common\Persistence\Mapping\ClassMetadata; |
|
| 23 | +use Doctrine\Common\Persistence\Mapping\Driver\AnnotationDriver as AbstractAnnotationDriver; |
|
| 24 | +use Doctrine\ODM\CouchDB\Mapping\Annotations as ODM; |
|
| 25 | +use Doctrine\ODM\CouchDB\Mapping\MappingException; |
|
| 29 | 26 | |
| 30 | 27 | /** |
| 31 | 28 | * The AnnotationDriver reads the mapping metadata from docblock annotations. |
@@ -19,11 +19,10 @@ |
||
| 19 | 19 | |
| 20 | 20 | namespace Doctrine\ODM\CouchDB\Mapping\Driver; |
| 21 | 21 | |
| 22 | -use Doctrine\Common\Persistence\Mapping\Driver\FileDriver, |
|
| 23 | - Doctrine\Common\Persistence\Mapping\ClassMetadata, |
|
| 24 | - Doctrine\ODM\CouchDB\Mapping\MappingException, |
|
| 25 | - Doctrine\Common\Persistence\Mapping\MappingException as DoctrineMappingException, |
|
| 26 | - SimpleXmlElement; |
|
| 22 | +use Doctrine\Common\Persistence\Mapping\Driver\FileDriver; |
|
| 23 | +use Doctrine\Common\Persistence\Mapping\ClassMetadata; |
|
| 24 | +use Doctrine\ODM\CouchDB\Mapping\MappingException; |
|
| 25 | +use Doctrine\Common\Persistence\Mapping\MappingException as DoctrineMappingException; |
|
| 27 | 26 | |
| 28 | 27 | /** |
| 29 | 28 | * XmlDriver is a metadata driver that enables mapping through XML files. |
@@ -19,11 +19,11 @@ |
||
| 19 | 19 | |
| 20 | 20 | namespace Doctrine\ODM\CouchDB\Mapping\Driver; |
| 21 | 21 | |
| 22 | -use Doctrine\Common\Persistence\Mapping\Driver\FileDriver, |
|
| 23 | - Doctrine\Common\Persistence\Mapping\ClassMetadata, |
|
| 24 | - Doctrine\ODM\CouchDB\Mapping\MappingException, |
|
| 25 | - Doctrine\Common\Persistence\Mapping\MappingException as DoctrineMappingException, |
|
| 26 | - Symfony\Component\Yaml\Yaml; |
|
| 22 | +use Doctrine\Common\Persistence\Mapping\Driver\FileDriver; |
|
| 23 | +use Doctrine\Common\Persistence\Mapping\ClassMetadata; |
|
| 24 | +use Doctrine\ODM\CouchDB\Mapping\MappingException; |
|
| 25 | +use Doctrine\Common\Persistence\Mapping\MappingException as DoctrineMappingException; |
|
| 26 | +use Symfony\Component\Yaml\Yaml; |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * The YamlDriver reads the mapping metadata from yaml schema files. |
@@ -20,7 +20,6 @@ |
||
| 20 | 20 | namespace Doctrine\ODM\CouchDB\Mapping; |
| 21 | 21 | |
| 22 | 22 | use Doctrine\Common\Collections\ArrayCollection; |
| 23 | -use Doctrine\ODM\CouchDB\Mapping\ClassMetadata; |
|
| 24 | 23 | use Doctrine\ODM\CouchDB\Types\Type; |
| 25 | 24 | use Doctrine\Common\Util\ClassUtils; |
| 26 | 25 | |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use Doctrine\ODM\CouchDB\Configuration; |
| 9 | 9 | use Doctrine\ODM\CouchDB\Mapping\Driver\AnnotationDriver; |
| 10 | 10 | use Doctrine\Common\Cache\ArrayCache; |
| 11 | -use Doctrine\Common\Annotations\AnnotationReader; |
|
| 12 | 11 | |
| 13 | 12 | abstract class CouchDBFunctionalTestCase extends \PHPUnit_Framework_TestCase |
| 14 | 13 | { |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | |
| 4 | 4 | use Doctrine\Tests\Models\Embedded\Embedded; |
| 5 | 5 | use Doctrine\Tests\Models\Embedded\Embedder; |
| 6 | -use Doctrine\Tests\Models\Embedded\Nested; |
|
| 7 | 6 | |
| 8 | 7 | class EmbedManyTest extends \Doctrine\Tests\ODM\CouchDB\CouchDBFunctionalTestCase |
| 9 | 8 | { |