PHPLIB-1597 Accept a $-prefixed string anywhere an expression is acce…

…pted
mongodb · Jan 23, 2025 · 1b8896a · 1b8896a
1 parent 3a8a0a7
commit 1b8896a
Show file tree

Hide file tree

Showing 187 changed files with 1,849 additions and 1,800 deletions.
diff --git a/generator/config/expressions.php b/generator/config/expressions.php
@@ -13,6 +13,7 @@
 use MongoDB\Model\BSONArray;
 use stdClass;
 
+use function in_array;
 use function ucfirst;
 
 $bsonTypes = [
@@ -45,6 +46,11 @@
 $expressions = [];
 $resolvesToInterfaces = [];
 foreach ($bsonTypes as $name => $acceptedTypes) {
+    // an expression can be a string with a $-prefixed field name
+    if (! in_array('string', $acceptedTypes)) {
+        $acceptedTypes[] = 'string';
+    }
+
     $expressions[$name] = ['acceptedTypes' => $acceptedTypes];
 
     $resolvesTo = 'resolvesTo' . ucfirst($name);

diff --git a/src/Builder/Accumulator/AccumulatorAccumulator.php b/src/Builder/Accumulator/AccumulatorAccumulator.php
diff --git a/src/Builder/Accumulator/AvgAccumulator.php b/src/Builder/Accumulator/AvgAccumulator.php
diff --git a/src/Builder/Accumulator/BottomAccumulator.php b/src/Builder/Accumulator/BottomAccumulator.php
diff --git a/src/Builder/Accumulator/BottomNAccumulator.php b/src/Builder/Accumulator/BottomNAccumulator.php
diff --git a/src/Builder/Accumulator/CovariancePopAccumulator.php b/src/Builder/Accumulator/CovariancePopAccumulator.php
diff --git a/src/Builder/Accumulator/CovarianceSampAccumulator.php b/src/Builder/Accumulator/CovarianceSampAccumulator.php
diff --git a/src/Builder/Accumulator/DerivativeAccumulator.php b/src/Builder/Accumulator/DerivativeAccumulator.php
diff --git a/src/Builder/Accumulator/ExpMovingAvgAccumulator.php b/src/Builder/Accumulator/ExpMovingAvgAccumulator.php