@@ -261,11 +261,17 @@ discard block  | 
                                                    ||
| 261 | 261 | return $this->attributes['proxyNamespace'];  | 
                                                        
| 262 | 262 | }  | 
                                                        
| 263 | 263 | |
| 264 | + /**  | 
                                                        |
| 265 | + * @param boolean $bool  | 
                                                        |
| 266 | + */  | 
                                                        |
| 264 | 267 | public function setAutoGenerateProxyClasses($bool)  | 
                                                        
| 265 | 268 |      { | 
                                                        
| 266 | 269 | $this->attributes['autoGenerateProxyClasses'] = $bool;  | 
                                                        
| 267 | 270 | }  | 
                                                        
| 268 | 271 | |
| 272 | + /**  | 
                                                        |
| 273 | + * @return boolean  | 
                                                        |
| 274 | + */  | 
                                                        |
| 269 | 275 | public function getAutoGenerateProxyClasses()  | 
                                                        
| 270 | 276 |      { | 
                                                        
| 271 | 277 | return $this->attributes['autoGenerateProxyClasses'];  | 
                                                        
@@ -274,7 +280,7 @@ discard block  | 
                                                    ||
| 274 | 280 | /**  | 
                                                        
| 275 | 281 | * @param string $name  | 
                                                        
| 276 | 282 | * @param string $className  | 
                                                        
| 277 | - * @param array $options  | 
                                                        |
| 283 | + * @param string $options  | 
                                                        |
| 278 | 284 | */  | 
                                                        
| 279 | 285 | public function addDesignDocument($name, $className, $options)  | 
                                                        
| 280 | 286 |      { | 
                                                        
@@ -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;  | 
                                                        
@@ -320,7 +320,7 @@  | 
                                                    ||
| 320 | 320 | }  | 
                                                        
| 321 | 321 | |
| 322 | 322 | /**  | 
                                                        
| 323 | - * @param object $document  | 
                                                        |
| 323 | + * @param \Doctrine\Tests\Models\CMS\CmsUser $document  | 
                                                        |
| 324 | 324 | * @return bool  | 
                                                        
| 325 | 325 | */  | 
                                                        
| 326 | 326 | public function contains($document)  | 
                                                        
@@ -26,6 +26,9 @@  | 
                                                    ||
| 26 | 26 | |
| 27 | 27 | private $documentManager;  | 
                                                        
| 28 | 28 | |
| 29 | + /**  | 
                                                        |
| 30 | + * @param \Doctrine\ODM\CouchDB\DocumentManager $documentManager  | 
                                                        |
| 31 | + */  | 
                                                        |
| 29 | 32 | function __construct($document, $documentManager)  | 
                                                        
| 30 | 33 |      { | 
                                                        
| 31 | 34 | $this->document = $document;  | 
                                                        
@@ -270,7 +270,7 @@ discard block  | 
                                                    ||
| 270 | 270 | * - reflClass (ReflectionClass)  | 
                                                        
| 271 | 271 | * - reflFields (ReflectionProperty array)  | 
                                                        
| 272 | 272 | *  | 
                                                        
| 273 | - * @return array The names of all the fields that should be serialized.  | 
                                                        |
| 273 | + * @return string[] The names of all the fields that should be serialized.  | 
                                                        |
| 274 | 274 | */  | 
                                                        
| 275 | 275 | public function __sleep()  | 
                                                        
| 276 | 276 |      { | 
                                                        
@@ -330,6 +330,7 @@ discard block  | 
                                                    ||
| 330 | 330 | |
| 331 | 331 | /**  | 
                                                        
| 332 | 332 | * Restores some state that can not be serialized/unserialized.  | 
                                                        
| 333 | + * @param \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService $reflService  | 
                                                        |
| 333 | 334 | */  | 
                                                        
| 334 | 335 | public function wakeupReflection($reflService)  | 
                                                        
| 335 | 336 |      { | 
                                                        
@@ -419,7 +420,7 @@ discard block  | 
                                                    ||
| 419 | 420 | * Sets the document identifier of a document.  | 
                                                        
| 420 | 421 | *  | 
                                                        
| 421 | 422 | * @param object $document  | 
                                                        
| 422 | - * @param mixed $id  | 
                                                        |
| 423 | + * @param string $id  | 
                                                        |
| 423 | 424 | */  | 
                                                        
| 424 | 425 | public function setIdentifierValue($document, $id)  | 
                                                        
| 425 | 426 |      { | 
                                                        
@@ -518,7 +519,7 @@ discard block  | 
                                                    ||
| 518 | 519 | * Since CouchDB only allows exactly one identifier field this is a proxy  | 
                                                        
| 519 | 520 |       * to {@see getIdentifier()} and returns an array. | 
                                                        
| 520 | 521 | *  | 
                                                        
| 521 | - * @return array  | 
                                                        |
| 522 | + * @return string[]  | 
                                                        |
| 522 | 523 | */  | 
                                                        
| 523 | 524 | public function getIdentifierFieldNames()  | 
                                                        
| 524 | 525 |      { | 
                                                        
@@ -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.  | 
                                                        
@@ -41,6 +41,7 @@  | 
                                                    ||
| 41 | 41 | |
| 42 | 42 | /**  | 
                                                        
| 43 | 43 |       * {@inheritDoc} | 
                                                        
| 44 | + * @param string[] $locator  | 
                                                        |
| 44 | 45 | */  | 
                                                        
| 45 | 46 | public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENSION)  | 
                                                        
| 46 | 47 |      { | 
                                                        
@@ -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.  | 
                                                        
@@ -41,6 +41,7 @@  | 
                                                    ||
| 41 | 41 | |
| 42 | 42 | /**  | 
                                                        
| 43 | 43 |       * {@inheritDoc} | 
                                                        
| 44 | + * @param string[] $locator  | 
                                                        |
| 44 | 45 | */  | 
                                                        
| 45 | 46 | public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENSION)  | 
                                                        
| 46 | 47 |      { | 
                                                        
@@ -38,6 +38,9 @@  | 
                                                    ||
| 38 | 38 | |
| 39 | 39 | private $metadataResolver;  | 
                                                        
| 40 | 40 | |
| 41 | + /**  | 
                                                        |
| 42 | + * @param ClassMetadataFactory $metadataFactory  | 
                                                        |
| 43 | + */  | 
                                                        |
| 41 | 44 | public function __construct($metadataFactory, $metadataResolver)  | 
                                                        
| 42 | 45 |      { | 
                                                        
| 43 | 46 | $this->metadataFactory = $metadataFactory;  | 
                                                        
@@ -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 | |