RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-459] Moved Doctrine\ORM\AbstractQuery to Doctrine\ORM\Query\AbstractQuery, which is compatible with Doctrine Coding Standards

Browse source
This commit is contained in:
guilhermeblanco 2010-03-23 17:53:38 +00:00
parent b175427043
commit 50c4e50921
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Doctrine/ORM/NativeQuery.php
View file

@ -21,6 +21,8 @@
namespace Doctrine\ORM; namespace Doctrine\ORM;
use Doctrine\ORM\Query\AbstractQuery;
/** /**
* Represents a native SQL query. * Represents a native SQL query.
* *

3
lib/Doctrine/ORM/Query.php
View file

@ -21,7 +21,8 @@
namespace Doctrine\ORM; namespace Doctrine\ORM;
use Doctrine\ORM\Query\Parser, use Doctrine\ORM\Query\AbstractQuery,
Doctrine\ORM\Query\Parser,
Doctrine\ORM\Query\QueryException; Doctrine\ORM\Query\QueryException;
/** /**

31
lib/Doctrine/ORM/AbstractQuery.php → lib/Doctrine/ORM/Query/AbstractQuery.php
View file

@ -19,7 +19,7 @@
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */
namespace Doctrine\ORM; namespace Doctrine\ORM\Query;
use Doctrine\ORM\Query\QueryException; use Doctrine\ORM\Query\QueryException;
@ -123,7 +123,7 @@ abstract class AbstractQuery
* *
* @param Doctrine\ORM\EntityManager $entityManager * @param Doctrine\ORM\EntityManager $entityManager
*/ */
public function __construct(EntityManager $entityManager) public function __construct(\Doctrine\ORM\EntityManager $entityManager)
{ {
$this->_em = $entityManager; $this->_em = $entityManager;
} }
@ -222,12 +222,12 @@ abstract class AbstractQuery
* Defines a cache driver to be used for caching result sets. * Defines a cache driver to be used for caching result sets.
* *
* @param Doctrine\Common\Cache\Cache $driver Cache driver * @param Doctrine\Common\Cache\Cache $driver Cache driver
* @return Doctrine\ORM\AbstractQuery * @return Doctrine\ORM\Query\AbstractQuery
*/ */
public function setResultCacheDriver($resultCacheDriver = null) public function setResultCacheDriver($resultCacheDriver = null)
{ {
if ($resultCacheDriver !== null && ! ($resultCacheDriver instanceof \Doctrine\Common\Cache\Cache)) { if ($resultCacheDriver !== null && ! ($resultCacheDriver instanceof \Doctrine\Common\Cache\Cache)) {
throw ORMException::invalidResultCacheDriver(); throw \Doctrine\ORM\ORMException::invalidResultCacheDriver();
} }
$this->_resultCacheDriver = $resultCacheDriver; $this->_resultCacheDriver = $resultCacheDriver;
if ($resultCacheDriver) { if ($resultCacheDriver) {
@ -270,7 +270,7 @@ abstract class AbstractQuery
* Defines how long the result cache will be active before expire. * Defines how long the result cache will be active before expire.
* *
* @param integer $timeToLive How long the cache entry is valid * @param integer $timeToLive How long the cache entry is valid
* @return Doctrine\ORM\AbstractQuery * @return Doctrine\ORM\Query\AbstractQuery
*/ */
public function setResultCacheLifetime($timeToLive) public function setResultCacheLifetime($timeToLive)
{ {
@ -296,7 +296,7 @@ abstract class AbstractQuery
* Defines if the result cache is active or not. * Defines if the result cache is active or not.
* *
* @param boolean $expire Whether or not to force resultset cache expiration. * @param boolean $expire Whether or not to force resultset cache expiration.
* @return Doctrine\ORM\AbstractQuery * @return Doctrine\ORM\Query\AbstractQuery
*/ */
public function expireResultCache($expire = true) public function expireResultCache($expire = true)
{ {
@ -319,7 +319,7 @@ abstract class AbstractQuery
* *
* @param integer $hydrationMode Doctrine processing mode to be used during hydration process. * @param integer $hydrationMode Doctrine processing mode to be used during hydration process.
* One of the Query::HYDRATE_* constants. * One of the Query::HYDRATE_* constants.
* @return Doctrine\ORM\AbstractQuery * @return Doctrine\ORM\Query\AbstractQuery
*/ */
public function setHydrationMode($hydrationMode) public function setHydrationMode($hydrationMode)
{ {
@ -383,25 +383,25 @@ abstract class AbstractQuery
* *
* @param integer $hydrationMode * @param integer $hydrationMode
* @return mixed * @return mixed
* @throws QueryException If the query result is not unique. * @throws Doctrine\ORM\NonUniqueResultException If the query result is not unique.
* @throws NoResultException If the query returned no result. * @throws Doctrine\ORM\NoResultException If the query returned no result.
*/ */
public function getSingleResult($hydrationMode = null) public function getSingleResult($hydrationMode = null)
{ {
$result = $this->execute(array(), $hydrationMode); $result = $this->execute(array(), $hydrationMode);
if ($this->_hydrationMode !== self::HYDRATE_SINGLE_SCALAR && ! $result) { if ($this->_hydrationMode !== self::HYDRATE_SINGLE_SCALAR && ! $result) {
throw new NoResultException; throw new \Doctrine\ORM\NoResultException;
} }
if (is_array($result)) { if (is_array($result)) {
if (count($result) > 1) { if (count($result) > 1) {
throw new NonUniqueResultException; throw new \Doctrine\ORM\NonUniqueResultException;
} }
return array_shift($result); return array_shift($result);
} else if (is_object($result)) { } else if (is_object($result)) {
if (count($result) > 1) { if (count($result) > 1) {
throw new NonUniqueResultException; throw new \Doctrine\ORM\NonUniqueResultException;
} }
return $result->first(); return $result->first();
} }
@ -415,7 +415,8 @@ abstract class AbstractQuery
* Alias for getSingleResult(HYDRATE_SINGLE_SCALAR). * Alias for getSingleResult(HYDRATE_SINGLE_SCALAR).
* *
* @return mixed * @return mixed
* @throws QueryException If the query result is not unique. * @throws Doctrine\ORM\NonUniqueResultException If the query result is not unique.
* @throws Doctrine\ORM\NoResultException If the query returned no result.
*/ */
public function getSingleScalarResult() public function getSingleScalarResult()
{ {
@ -427,7 +428,7 @@ abstract class AbstractQuery
* *
* @param string $name The name of the hint. * @param string $name The name of the hint.
* @param mixed $value The value of the hint. * @param mixed $value The value of the hint.
* @return Doctrine\ORM\AbstractQuery * @return Doctrine\ORM\Query\AbstractQuery
*/ */
public function setHint($name, $value) public function setHint($name, $value)
{ {
@ -528,7 +529,7 @@ abstract class AbstractQuery
* generated for you. * generated for you.
* *
* @param string $id * @param string $id
* @return Doctrine\ORM\AbstractQuery * @return Doctrine\ORM\Query\AbstractQuery
*/ */
public function setResultCacheId($id) public function setResultCacheId($id)
{ {