[DDC-1766] Cleaned up code.

richardmiller-zz · Apr 4, 2012 · f7496b1 · f7496b1
1 parent d31c7f5
commit f7496b1
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php
@@ -329,10 +329,12 @@ public function setResultSetMapping(Query\ResultSetMapping $rsm)
     public function setHydrationCacheProfile(QueryCacheProfile $profile = null)
     {
         if ( ! $profile->getResultCacheDriver()) {
-            $profile = $profile->setResultCacheDriver($this->_em->getConfiguration()->getResultCacheImpl());
+            $resultCacheDriver = $this->_em->getConfiguration()->getResultCacheImpl();
+            $profile = $profile->setResultCacheDriver($resultCacheDriver);
         }
 
         $this->_hydrationCacheProfile = $profile;
+
         return $this;
     }
 
@@ -356,10 +358,12 @@ public function getHydrationCacheProfile()
     public function setResultCacheProfile(QueryCacheProfile $profile = null)
     {
         if ( ! $profile->getResultCacheDriver()) {
-            $profile = $profile->setResultCacheDriver($this->_em->getConfiguration()->getResultCacheImpl());
+            $resultCacheDriver = $this->_em->getConfiguration()->getResultCacheImpl();
+            $profile = $profile->setResultCacheDriver($resultCacheDriver);
         }
 
         $this->_queryCacheProfile = $profile;
+
         return $this;
     }
 
@@ -709,13 +713,14 @@ public function execute($params = array(), $hydrationMode = null)
         }
 
         $setCacheEntry = function() {};
+
         if ($this->_hydrationCacheProfile !== null) {
             list($cacheKey, $realCacheKey) = $this->getHydrationCacheId();
 
-            $qcp = $this->getHydrationCacheProfile();
-            $cache = $qcp->getResultCacheDriver();
-
+            $qcp    = $this->getHydrationCacheProfile();
+            $cache  = $qcp->getResultCacheDriver();
             $result = $cache->fetch($cacheKey);
+
             if (isset($result[$realCacheKey])) {
                 return $result[$realCacheKey];
             }
@@ -734,6 +739,7 @@ public function execute($params = array(), $hydrationMode = null)
 
         if (is_numeric($stmt)) {
             $setCacheEntry($stmt);
+
             return $stmt;
         }
 
@@ -756,6 +762,7 @@ public function execute($params = array(), $hydrationMode = null)
     protected function getHydrationCacheId()
     {
         $params = $this->getParameters();
+
         foreach ($params AS $key => $value) {
             if (is_object($value) && $this->_em->getMetadataFactory()->hasMetadataFor(get_class($value))) {
                 if ($this->_em->getUnitOfWork()->getEntityState($value) == UnitOfWork::STATE_MANAGED) {