fix: add recursive normalizeWhere helper, address CodeRabbit review

- Add normalizeWhere() recursive helper that walks full condition tree
- Collapses sole $eq_pointer to raw pointer, rewrites mixed cases to $eq
- Both _getOptions() and distinct() now use normalizeWhere()
- Fix verify_equalto.php autoloader to use __DIR__ (portable)
- Update Test 5 to test same-key mixed constraint case

Author: dacdoyx

src/Parse/ParseQuery.php

@@ -498,6 +498,40 @@ public function fullText($key, $value)
         return $this;
     }
 
+    /**
+     * Recursively normalize the where clause, collapsing $eq_pointer sentinel
+     * values to raw pointers (for ParseObject equality) or rewriting mixed
+     * same-key cases to $eq. Handles nested condition trees (or/and/nor queries).
+     *
+     * @param mixed $value
+     * @return mixed
+     */
+    private function normalizeWhere($value)
+    {
+        if (!is_array($value)) {
+            return $value;
+        }
+
+        if (array_key_exists('$eq_pointer', $value)) {
+            $pointer = $value['$eq_pointer'];
+            unset($value['$eq_pointer']);
+
+            if (count($value) === 0) {
+                // Sole condition: collapse to raw pointer
+                return $pointer;
+            }
+
+            // Mixed same-key case: rewrite to $eq alongside other operators
+            $value['$eq'] = $pointer;
+        }
+
+        foreach ($value as $k => $v) {
+            $value[$k] = $this->normalizeWhere($v);
+        }
+
+        return $value;
+    }
+
     /**
      * Returns an associative array of the query constraints.
      *
@@ -507,14 +541,7 @@ public function _getOptions()
     {
         $opts = [];
         if (!empty($this->where)) {
-            $where = $this->where;
-            // Collapse $eq_pointer to raw pointer for array value queries
-            foreach ($where as $key => $conditions) {
-                if (is_array($conditions) && array_key_exists('$eq_pointer', $conditions) && count($conditions) === 1) {
-                    $where[$key] = $conditions['$eq_pointer'];
-                }
-            }
-            $opts['where'] = $where;
+            $opts['where'] = $this->normalizeWhere($this->where);
         }
         if (count($this->includes)) {
             $opts['include'] = implode(',', $this->includes);
@@ -646,13 +673,7 @@ public function distinct($key)
         }
          $opts = [];
         if (!empty($this->where)) {
-            $where = $this->where;
-            foreach ($where as $k => $conditions) {
-                if (is_array($conditions) && array_key_exists('$eq_pointer', $conditions) && count($conditions) === 1) {
-                    $where[$k] = $conditions['$eq_pointer'];
-                }
-            }
-            $opts['where'] = $where;
+            $opts['where'] = $this->normalizeWhere($this->where);
         }
         $opts['distinct'] = $key;
         $queryString = $this->buildQueryString($opts);

verify_equalto.php

@@ -1,7 +1,7 @@
 <?php
 spl_autoload_register(function ($class) {
     $prefix = 'Parse\\';
-    $base = '/root/parse-php-sdk/src/Parse/';
+    $base = __DIR__ . '/src/Parse/';
     if (strpos($class, $prefix) !== 0) return;
     $relative = substr($class, strlen($prefix));
     $file = $base . str_replace('\\', '/', $relative) . '.php';
@@ -68,16 +68,17 @@ function check($name, $condition) {
 echo "  where = $encoded4\n";
 check('foo should have both $eq and $gt', strpos($encoded4, '$eq') !== false && strpos($encoded4, '$gt') !== false);
 
-// Test 5: ParseObject + another constraint on same key (order-dependent case)
-echo "\nTest 5: ParseObject with other constraints\n";
+// Test 5: ParseObject + another constraint on SAME key (mixed case)
+echo "\nTest 5: ParseObject with other constraints on same key\n";
 $query5 = new ParseQuery('TestClass');
-$query5->greaterThan('count', 5);
 $query5->equalTo('users', $user);
+$query5->exists('users');
 $opts5 = $query5->_getOptions();
 $encoded5 = json_encode($opts5['where'] ?? []);
 echo "  where = $encoded5\n";
-check('count should have $gt', strpos($encoded5, '$gt') !== false);
-check('users should be direct pointer', strpos($encoded5, '"__type":"Pointer"') !== false);
+check('should NOT have $eq_pointer in output', strpos($encoded5, '$eq_pointer') === false);
+check('users should still contain the pointer payload', strpos($encoded5, '"__type":"Pointer"') !== false);
+check('users should still contain the sibling operator', strpos($encoded5, '$exists') !== false);
 
 echo "\n=== Results: $passed passed, $failed failed ===\n";
 exit($failed > 0 ? 1 : 0);