@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | /** |
43 | 43 | * A query object is in CLEAN state when it has NO unparsed/unprocessed DQL parts. |
44 | 44 | */ |
45 | - const STATE_CLEAN = 1; |
|
45 | + const STATE_CLEAN = 1; |
|
46 | 46 | |
47 | 47 | /** |
48 | 48 | * A query object is in state DIRTY when it has DQL parts that have not yet been |
@@ -738,11 +738,11 @@ discard block |
||
738 | 738 | ->getName(); |
739 | 739 | |
740 | 740 | return md5( |
741 | - $this->getDQL() . serialize($this->_hints) . |
|
742 | - '&platform=' . $platform . |
|
743 | - ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') . |
|
744 | - '&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults . |
|
745 | - '&hydrationMode=' . $this->_hydrationMode . '&types=' . serialize($this->_parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT' |
|
741 | + $this->getDQL().serialize($this->_hints). |
|
742 | + '&platform='.$platform. |
|
743 | + ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : ''). |
|
744 | + '&firstResult='.$this->_firstResult.'&maxResult='.$this->_maxResults. |
|
745 | + '&hydrationMode='.$this->_hydrationMode.'&types='.serialize($this->_parsedTypes).'DOCTRINE_QUERY_CACHE_SALT' |
|
746 | 746 | ); |
747 | 747 | } |
748 | 748 | |
@@ -751,7 +751,7 @@ discard block |
||
751 | 751 | */ |
752 | 752 | protected function getHash() |
753 | 753 | { |
754 | - return sha1(parent::getHash(). '-'. $this->_firstResult . '-' . $this->_maxResults); |
|
754 | + return sha1(parent::getHash().'-'.$this->_firstResult.'-'.$this->_maxResults); |
|
755 | 755 | } |
756 | 756 | |
757 | 757 | /** |