RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-19 06:51:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #247 from juzna/fix-phpdoc

Browse Source 
fixed phpDoc and typos
This commit is contained in:
Guilherme Blanco 2011-12-30 13:05:37 -08:00
commit 4ae7851a04
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -605,7 +605,7 @@ abstract class AbstractQuery
/**
* Set the result cache id to use to store the result set cache entry.
* If this is not explicitely set by the developer then a hash is automatically
* If this is not explicitly set by the developer then a hash is automatically
* generated for you.
*
* @param string $id

9
lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
View File

@ -36,22 +36,22 @@ use PDO,
*/
abstract class AbstractHydrator
{
/** @var ResultSetMapping The ResultSetMapping. */
/** @var \Doctrine\ORM\Query\ResultSetMapping The ResultSetMapping. */
protected $_rsm;
/** @var EntityManager The EntityManager instance. */
protected $_em;
/** @var AbstractPlatform The dbms Platform instance */
/** @var \Doctrine\DBAL\Platforms\AbstractPlatform The dbms Platform instance */
protected $_platform;
/** @var UnitOfWork The UnitOfWork of the associated EntityManager. */
/** @var \Doctrine\ORM\UnitOfWork The UnitOfWork of the associated EntityManager. */
protected $_uow;
/** @var array The cache used during row-by-row hydration. */
protected $_cache = array();
/** @var Statement The statement that provides the data to hydrate. */
/** @var \Doctrine\DBAL\Driver\Statement The statement that provides the data to hydrate. */
protected $_stmt;
/** @var array The query hints. */
@ -93,6 +93,7 @@ abstract class AbstractHydrator
*
* @param object $stmt
* @param object $resultSetMapping
* @param array $hints
* @return mixed
*/
public function hydrateAll($stmt, $resultSetMapping, array $hints = array())

4
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View File

@ -208,8 +208,8 @@ class ObjectHydrator extends AbstractHydrator
/**
* Gets an entity instance.
*
* @param $data The instance data.
* @param $dqlAlias The DQL alias of the entity's class.
* @param array $data The instance data.
* @param string $dqlAlias The DQL alias of the entity's class.
* @return object The entity.
*/
private function _getEntity(array $data, $dqlAlias)

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

@ -422,7 +422,7 @@ class ClassMetadataInfo
/**
* READ-ONLY: The ID generator used for generating IDs for this class.
*
* @var AbstractIdGenerator
* @var \Doctrine\ORM\Id\AbstractIdGenerator
* @todo Remove!
*/
public $idGenerator;