Skip to content

Commit 0241c0b

Browse files
committed
PHP 8.2 > Removed properties from Doctrine_RawSql and used _preQueried in case of clear() and moved the property _pendingJoinConditions fom Doctrine_Query up to Doctrine_Query_Abstract in the hierarchy.
1 parent 33bca65 commit 0241c0b

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

lib/Doctrine/Query.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,6 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
160160
*/
161161
protected $_parsers = array();
162162

163-
/**
164-
* @var array $_pendingJoinConditions an array containing pending joins
165-
*/
166-
protected $_pendingJoinConditions = array();
167-
168163
/**
169164
* @var array
170165
*/

lib/Doctrine/Query/Abstract.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,11 @@ abstract class Doctrine_Query_Abstract
267267
*/
268268
protected $_preQueried = false;
269269

270+
/**
271+
* @var array $_pendingJoinConditions an array containing pending joins
272+
*/
273+
protected $_pendingJoinConditions = array();
274+
270275
/**
271276
* Fix for http://www.doctrine-project.org/jira/browse/DC-701
272277
*

lib/Doctrine/RawSql.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ class Doctrine_RawSql extends Doctrine_Query_Abstract
4242
* @var array $fields
4343
*/
4444
private $fields = array();
45-
/**
46-
* @var false
47-
*/
48-
protected $_preQuery;
49-
protected $_pendingJoinConditions;
5045

5146
/**
5247
* Constructor.
@@ -64,7 +59,7 @@ function __construct(Doctrine_Connection $connection = null, Doctrine_Hydrator_A
6459

6560
protected function clear()
6661
{
67-
$this->_preQuery = false;
62+
$this->_preQueried = false;
6863
$this->_pendingJoinConditions = array();
6964
}
7065

0 commit comments

Comments
 (0)