RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-21 15:33:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #578 from BenMorel/docfix

Browse Source 
Fix for wrong return types in documentation.
This commit is contained in:
Guilherme Blanco 2013-02-12 09:05:13 -08:00
commit 39374b7235
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/ORM/EntityManager.php
View File

@ -376,12 +376,12 @@ class EntityManager implements ObjectManager
/** /**
* Finds an Entity by its identifier. * Finds an Entity by its identifier.
* *
* @param string $entityName * @param string $entityName
* @param mixed $id * @param mixed $id
* @param integer $lockMode * @param integer $lockMode
* @param integer $lockVersion * @param integer|null $lockVersion
* *
* @return object * @return object|null The entity instance or NULL if the entity can not be found.
* *
* @throws OptimisticLockException * @throws OptimisticLockException
* @throws ORMInvalidArgumentException * @throws ORMInvalidArgumentException

4
lib/Doctrine/ORM/EntityRepository.php
View File

@ -147,7 +147,7 @@ class EntityRepository implements ObjectRepository, Selectable
* @param int $lockMode The lock mode. * @param int $lockMode The lock mode.
* @param int|null $lockVersion The lock version. * @param int|null $lockVersion The lock version.
* *
* @return object The entity. * @return object|null The entity instance or NULL if the entity can not be found.
*/ */
public function find($id, $lockMode = LockMode::NONE, $lockVersion = null) public function find($id, $lockMode = LockMode::NONE, $lockVersion = null)
{ {
@ -187,7 +187,7 @@ class EntityRepository implements ObjectRepository, Selectable
* @param array $criteria * @param array $criteria
* @param array|null $orderBy * @param array|null $orderBy
* *
* @return object * @return object|null The entity instance or NULL if the entity can not be found.
*/ */
public function findOneBy(array $criteria, array $orderBy = null) public function findOneBy(array $criteria, array $orderBy = null)
{ {

4
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -1676,9 +1676,7 @@ class ClassMetadataInfo implements ClassMetadata
} }
/** /**
* Gets the mapped identifier field of this class. * {@inheritDoc}
*
* @return array|string
*/ */
public function getIdentifier() public function getIdentifier()
{ {

2
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View File

@ -714,7 +714,7 @@ class BasicEntityPersister
* @param int|null $limit Limit number of results. * @param int|null $limit Limit number of results.
* @param array|null $orderBy Criteria to order by. * @param array|null $orderBy Criteria to order by.
* *
* @return object The loaded and managed entity instance or NULL if the entity can not be found. * @return object|null The loaded and managed entity instance or NULL if the entity can not be found.
* *
* @todo Check identity map? loadById method? Try to guess whether $criteria is the id? * @todo Check identity map? loadById method? Try to guess whether $criteria is the id?
*/ */