RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7441 from asgrim/fix-getResult-type

Browse Source 
$hydrationMode throughout can be a string as well as int (for custom modes)
This commit is contained in:
Luís Cobucci 2018-11-20 09:40:04 +01:00 committed by GitHub
commit 728e6e15c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@ abstract class AbstractQuery
/** /**
* The hydration mode. * The hydration mode.
* *
* @var integer * @var string|int
*/ */
protected $_hydrationMode = self::HYDRATE_OBJECT; protected $_hydrationMode = self::HYDRATE_OBJECT;
@ -690,8 +690,8 @@ abstract class AbstractQuery
/** /**
* Defines the processing mode to be used during hydration / result set transformation. * Defines the processing mode to be used during hydration / result set transformation.
* *
* @param integer $hydrationMode Doctrine processing mode to be used during hydration process. * @param string|int $hydrationMode Doctrine processing mode to be used during hydration process.
* One of the Query::HYDRATE_* constants. * One of the Query::HYDRATE_* constants.
* *
* @return static This query instance. * @return static This query instance.
*/ */
@ -705,7 +705,7 @@ abstract class AbstractQuery
/** /**
* Gets the hydration mode currently used by the query. * Gets the hydration mode currently used by the query.
* *
* @return integer * @return string|int
*/ */
public function getHydrationMode() public function getHydrationMode()
{ {
@ -717,7 +717,7 @@ abstract class AbstractQuery
* *
* Alias for execute(null, $hydrationMode = HYDRATE_OBJECT). * Alias for execute(null, $hydrationMode = HYDRATE_OBJECT).
* *
* @param int $hydrationMode * @param string|int $hydrationMode
* *
* @return mixed * @return mixed
*/ */
@ -753,7 +753,7 @@ abstract class AbstractQuery
/** /**
* Get exactly one result or null. * Get exactly one result or null.
* *
* @param int $hydrationMode * @param string|int $hydrationMode
* *
* @return mixed * @return mixed
* *
@ -791,7 +791,7 @@ abstract class AbstractQuery
* If the result is not unique, a NonUniqueResultException is thrown. * If the result is not unique, a NonUniqueResultException is thrown.
* If there is no result, a NoResultException is thrown. * If there is no result, a NoResultException is thrown.
* *
* @param integer $hydrationMode * @param string|int $hydrationMode
* *
* @return mixed * @return mixed
* *
@ -885,7 +885,7 @@ abstract class AbstractQuery
* iterate over the result. * iterate over the result.
* *
* @param ArrayCollection|array|null $parameters The query parameters. * @param ArrayCollection|array|null $parameters The query parameters.
* @param integer|null $hydrationMode The hydration mode to use. * @param string|int|null $hydrationMode The hydration mode to use.
* *
* @return \Doctrine\ORM\Internal\Hydration\IterableResult * @return \Doctrine\ORM\Internal\Hydration\IterableResult
*/ */
@ -909,7 +909,7 @@ abstract class AbstractQuery
* Executes the query. * Executes the query.
* *
* @param ArrayCollection|array|null $parameters Query parameters. * @param ArrayCollection|array|null $parameters Query parameters.
* @param integer|null $hydrationMode Processing mode to be used during the hydration process. * @param string|int|null $hydrationMode Processing mode to be used during the hydration process.
* *
* @return mixed * @return mixed
*/ */
@ -926,7 +926,7 @@ abstract class AbstractQuery
* Execute query ignoring second level cache. * Execute query ignoring second level cache.
* *
* @param ArrayCollection|array|null $parameters * @param ArrayCollection|array|null $parameters
* @param integer|null $hydrationMode * @param string|int|null $hydrationMode
* *
* @return mixed * @return mixed
*/ */
@ -984,7 +984,7 @@ abstract class AbstractQuery
* Load from second level cache or executes the query and put into cache. * Load from second level cache or executes the query and put into cache.
* *
* @param ArrayCollection|array|null $parameters * @param ArrayCollection|array|null $parameters
* @param integer|null $hydrationMode * @param string|int|null $hydrationMode
* *
* @return mixed * @return mixed
*/ */

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

@ -249,7 +249,7 @@ interface EntityManagerInterface extends ObjectManager
* *
* @deprecated * @deprecated
* *
* @param int $hydrationMode * @param string|int $hydrationMode
* *
* @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
*/ */
@ -258,7 +258,7 @@ interface EntityManagerInterface extends ObjectManager
/** /**
* Create a new instance for the given hydration mode. * Create a new instance for the given hydration mode.
* *
* @param int $hydrationMode * @param string|int $hydrationMode
* *
* @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
* *

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

@ -656,7 +656,7 @@ final class Query extends AbstractQuery
* iterated over the result. * iterated over the result.
* *
* @param ArrayCollection|array|null $parameters The query parameters. * @param ArrayCollection|array|null $parameters The query parameters.
* @param integer $hydrationMode The hydration mode to use. * @param string|int $hydrationMode The hydration mode to use.
* *
* @return \Doctrine\ORM\Internal\Hydration\IterableResult * @return \Doctrine\ORM\Internal\Hydration\IterableResult
*/ */