From 4e3c6c07a8c986b74b26dbd63078e1c391488e8f Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Mon, 9 Jan 2023 22:06:26 +0100
Subject: [PATCH] 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.

---
 lib/Doctrine/Query.php          | 5 -----
 lib/Doctrine/Query/Abstract.php | 5 +++++
 lib/Doctrine/RawSql.php         | 7 +------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
index 99f54a170..2ae35ee15 100644
--- a/lib/Doctrine/Query.php
+++ b/lib/Doctrine/Query.php
@@ -160,11 +160,6 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
      */
     protected $_parsers = array();
 
-    /**
-     * @var array $_pendingJoinConditions    an array containing pending joins
-     */
-    protected $_pendingJoinConditions = array();
-
     /**
      * @var array
      */
diff --git a/lib/Doctrine/Query/Abstract.php b/lib/Doctrine/Query/Abstract.php
index 3025bd09e..6042ed18e 100644
--- a/lib/Doctrine/Query/Abstract.php
+++ b/lib/Doctrine/Query/Abstract.php
@@ -267,6 +267,11 @@ abstract class Doctrine_Query_Abstract
      */
     protected $_preQueried = false;
 
+    /**
+     * @var array $_pendingJoinConditions    an array containing pending joins
+     */
+    protected $_pendingJoinConditions = array();
+
     /**
      * Fix for http://www.doctrine-project.org/jira/browse/DC-701
      *
diff --git a/lib/Doctrine/RawSql.php b/lib/Doctrine/RawSql.php
index 7fb3d9b7c..73220e2e9 100644
--- a/lib/Doctrine/RawSql.php
+++ b/lib/Doctrine/RawSql.php
@@ -42,11 +42,6 @@ class Doctrine_RawSql extends Doctrine_Query_Abstract
      * @var array $fields
      */
     private $fields = array();
-    /**
-     * @var false
-     */
-    protected $_preQuery;
-    protected $_pendingJoinConditions;
 
     /**
      * Constructor.
@@ -64,7 +59,7 @@ function __construct(Doctrine_Connection $connection = null, Doctrine_Hydrator_A
 
     protected function clear()
     {
-        $this->_preQuery = false;
+        $this->_preQueried = false;
         $this->_pendingJoinConditions = array();
     }