@@ -259,7 +259,7 @@ discard block  | 
                                                    ||
| 259 | 259 | * Gets the Hydrator factory used by the DocumentManager to generate and get hydrators  | 
                                                        
| 260 | 260 | * for each type of document.  | 
                                                        
| 261 | 261 | *  | 
                                                        
| 262 | - * @return \Doctrine\ODM\MongoDB\Hydrator\HydratorInterface  | 
                                                        |
| 262 | + * @return HydratorFactory  | 
                                                        |
| 263 | 263 | */  | 
                                                        
| 264 | 264 | public function getHydratorFactory()  | 
                                                        
| 265 | 265 |      { | 
                                                        
@@ -596,7 +596,7 @@ discard block  | 
                                                    ||
| 596 | 596 | * This is just a convenient shortcut for getRepository($documentName)->find($id).  | 
                                                        
| 597 | 597 | *  | 
                                                        
| 598 | 598 | * @param string $documentName  | 
                                                        
| 599 | - * @param mixed $identifier  | 
                                                        |
| 599 | + * @param \MongoId $identifier  | 
                                                        |
| 600 | 600 | * @param int $lockMode  | 
                                                        
| 601 | 601 | * @param int $lockVersion  | 
                                                        
| 602 | 602 | * @return object $document  | 
                                                        
@@ -64,7 +64,6 @@ discard block  | 
                                                    ||
| 64 | 64 | *  | 
                                                        
| 65 | 65 | * @param DocumentManager $dm The DocumentManager to use.  | 
                                                        
| 66 | 66 | * @param UnitOfWork $uow The UnitOfWork to use.  | 
                                                        
| 67 | - * @param Mapping\ClassMetadata $classMetadata The class descriptor.  | 
                                                        |
| 68 | 67 | */  | 
                                                        
| 69 | 68 | public function __construct(DocumentManager $dm, UnitOfWork $uow, Mapping\ClassMetadata $class)  | 
                                                        
| 70 | 69 |      { | 
                                                        
@@ -261,7 +260,7 @@ discard block  | 
                                                    ||
| 261 | 260 | *  | 
                                                        
| 262 | 261 | * @see Selectable::matching()  | 
                                                        
| 263 | 262 | * @param Criteria $criteria  | 
                                                        
| 264 | - * @return Collection  | 
                                                        |
| 263 | + * @return ArrayCollection  | 
                                                        |
| 265 | 264 | */  | 
                                                        
| 266 | 265 | public function matching(Criteria $criteria)  | 
                                                        
| 267 | 266 |      { | 
                                                        
@@ -60,7 +60,7 @@  | 
                                                    ||
| 60 | 60 | /**  | 
                                                        
| 61 | 61 | * Checks that a given string is a valid uuid.  | 
                                                        
| 62 | 62 | *  | 
                                                        
| 63 | - * @param string $uuid The string to check.  | 
                                                        |
| 63 | + * @param string $guid The string to check.  | 
                                                        |
| 64 | 64 | * @return boolean  | 
                                                        
| 65 | 65 | */  | 
                                                        
| 66 | 66 | public function isValid($guid)  | 
                                                        
@@ -20,7 +20,6 @@  | 
                                                    ||
| 20 | 20 | namespace Doctrine\ODM\MongoDB\Id;  | 
                                                        
| 21 | 21 | |
| 22 | 22 | use Doctrine\ODM\MongoDB\DocumentManager;  | 
                                                        
| 23 | -use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;  | 
                                                        |
| 24 | 23 | |
| 25 | 24 | /**  | 
                                                        
| 26 | 25 | * UuidGenerator generates a uuid for the id.  | 
                                                        
@@ -97,7 +97,7 @@  | 
                                                    ||
| 97 | 97 | * - reflClass (ReflectionClass)  | 
                                                        
| 98 | 98 | * - reflFields (ReflectionProperty array)  | 
                                                        
| 99 | 99 | *  | 
                                                        
| 100 | - * @return array The names of all the fields that should be serialized.  | 
                                                        |
| 100 | + * @return string[] The names of all the fields that should be serialized.  | 
                                                        |
| 101 | 101 | */  | 
                                                        
| 102 | 102 | public function __sleep()  | 
                                                        
| 103 | 103 |      { | 
                                                        
@@ -20,7 +20,6 @@  | 
                                                    ||
| 20 | 20 | namespace Doctrine\ODM\MongoDB\Mapping;  | 
                                                        
| 21 | 21 | |
| 22 | 22 | use Doctrine\Instantiator\Instantiator;  | 
                                                        
| 23 | -use Doctrine\ODM\MongoDB\LockException;  | 
                                                        |
| 24 | 23 | |
| 25 | 24 | /**  | 
                                                        
| 26 | 25 | * A <tt>ClassMetadata</tt> instance holds all the object-document mapping metadata  | 
                                                        
@@ -37,6 +37,7 @@ discard block  | 
                                                    ||
| 37 | 37 | |
| 38 | 38 | /**  | 
                                                        
| 39 | 39 |       * {@inheritDoc} | 
                                                        
| 40 | + * @param \Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator $locator  | 
                                                        |
| 40 | 41 | */  | 
                                                        
| 41 | 42 | public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENSION)  | 
                                                        
| 42 | 43 |      { | 
                                                        
@@ -234,6 +235,9 @@ discard block  | 
                                                    ||
| 234 | 235 | $class->addIndex($keys, $options);  | 
                                                        
| 235 | 236 | }  | 
                                                        
| 236 | 237 | |
| 238 | + /**  | 
                                                        |
| 239 | + * @param string $type  | 
                                                        |
| 240 | + */  | 
                                                        |
| 237 | 241 | private function addEmbedMapping(ClassMetadataInfo $class, $embed, $type)  | 
                                                        
| 238 | 242 |      { | 
                                                        
| 239 | 243 | $cascade = array_keys((array) $embed->cascade);  | 
                                                        
@@ -273,6 +277,9 @@ discard block  | 
                                                    ||
| 273 | 277 | $this->addFieldMapping($class, $mapping);  | 
                                                        
| 274 | 278 | }  | 
                                                        
| 275 | 279 | |
| 280 | + /**  | 
                                                        |
| 281 | + * @param string $type  | 
                                                        |
| 282 | + */  | 
                                                        |
| 276 | 283 | private function addReferenceMapping(ClassMetadataInfo $class, $reference, $type)  | 
                                                        
| 277 | 284 |      { | 
                                                        
| 278 | 285 | $cascade = array_keys((array) $reference->cascade);  | 
                                                        
@@ -38,6 +38,7 @@  | 
                                                    ||
| 38 | 38 | |
| 39 | 39 | /**  | 
                                                        
| 40 | 40 |       * {@inheritDoc} | 
                                                        
| 41 | + * @param \Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator $locator  | 
                                                        |
| 41 | 42 | */  | 
                                                        
| 42 | 43 | public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENSION)  | 
                                                        
| 43 | 44 |      { | 
                                                        
@@ -329,7 +329,7 @@  | 
                                                    ||
| 329 | 329 | * INTERNAL:  | 
                                                        
| 330 | 330 | * getInsertDiff  | 
                                                        
| 331 | 331 | *  | 
                                                        
| 332 | - * @return array  | 
                                                        |
| 332 | + * @return callable  | 
                                                        |
| 333 | 333 | */  | 
                                                        
| 334 | 334 | public function getInsertDiff()  | 
                                                        
| 335 | 335 |      { | 
                                                        
@@ -87,7 +87,7 @@  | 
                                                    ||
| 87 | 87 | * Construct a Builder  | 
                                                        
| 88 | 88 | *  | 
                                                        
| 89 | 89 | * @param DocumentManager $dm  | 
                                                        
| 90 | - * @param string[]|string|null $documentName (optional) an array of document names, the document name, or none  | 
                                                        |
| 90 | + * @param string|null $documentName (optional) an array of document names, the document name, or none  | 
                                                        |
| 91 | 91 | */  | 
                                                        
| 92 | 92 | public function __construct(DocumentManager $dm, $documentName = null)  | 
                                                        
| 93 | 93 |      { | 
                                                        
@@ -20,7 +20,6 @@  | 
                                                    ||
| 20 | 20 | namespace Doctrine\ODM\MongoDB\Query;  | 
                                                        
| 21 | 21 | |
| 22 | 22 | use Doctrine\ODM\MongoDB\DocumentManager;  | 
                                                        
| 23 | -use Doctrine\ODM\MongoDB\Hydrator;  | 
                                                        |
| 24 | 23 | use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo;  | 
                                                        
| 25 | 24 | use Doctrine\ODM\MongoDB\Query\Expr;  | 
                                                        
| 26 | 25 | use Doctrine\ODM\MongoDB\UnitOfWork;  | 
                                                        
@@ -31,7 +31,6 @@  | 
                                                    ||
| 31 | 31 | /**  | 
                                                        
| 32 | 32 | * Combines any number of criteria arrays as clauses of an "$and" query.  | 
                                                        
| 33 | 33 | *  | 
                                                        
| 34 | - * @param array $criteria,... Any number of query criteria arrays  | 
                                                        |
| 35 | 34 | * @return array  | 
                                                        
| 36 | 35 | */  | 
                                                        
| 37 | 36 | public function merge(/* array($field => $value), ... */)  |