Merge branch '2.7.x' into 2.8.x

doctrine · May 1, 2024 · 964dd1d · 964dd1d
2 parents 48c10d4 + 89da7c8
commit 964dd1d
Showing 1 changed file with 119 additions and 131 deletions.
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/AggregationOperatorsProviderTrait.php b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/AggregationOperatorsProviderTrait.php
@@ -56,125 +56,125 @@ public static function provideAccumulatorExpressionOperators(): Generator
 
     public static function provideArithmeticExpressionOperators(): Generator
     {
-            yield 'abs' => [
-                'expected' => ['$abs' => '$field'],
-                'operator' => 'abs',
-                'args' => ['$field'],
-            ];
-
-            yield 'addWithTwoArgs' => [
-                'expected' => ['$add' => [5, '$field']],
-                'operator' => 'add',
-                'args' => [5, '$field'],
-            ];
-
-            yield 'addWithMultipleArgs' => [
-                'expected' => ['$add' => [5, '$field', '$otherField', 4.99]],
-                'operator' => 'add',
-                'args' => [5, '$field', '$otherField', 4.99],
-            ];
-
-            yield 'ceil' => [
-                'expected' => ['$ceil' => '$field'],
-                'operator' => 'ceil',
-                'args' => ['$field'],
-            ];
-
-            yield 'divide' => [
-                'expected' => ['$divide' => ['$field', 5]],
-                'operator' => 'divide',
-                'args' => ['$field', 5],
-            ];
-
-            yield 'exp' => [
-                'expected' => ['$exp' => '$field'],
-                'operator' => 'exp',
-                'args' => ['$field'],
-            ];
-
-            yield 'floor' => [
-                'expected' => ['$floor' => '$field'],
-                'operator' => 'floor',
-                'args' => ['$field'],
-            ];
-
-            yield 'ln' => [
-                'expected' => ['$ln' => '$field'],
-                'operator' => 'ln',
-                'args' => ['$field'],
-            ];
-
-            yield 'log' => [
-                'expected' => ['$log' => ['$field', '$base']],
-                'operator' => 'log',
-                'args' => ['$field', '$base'],
-            ];
-
-            yield 'log10' => [
-                'expected' => ['$log10' => '$field'],
-                'operator' => 'log10',
-                'args' => ['$field'],
-            ];
-
-            yield 'mod' => [
-                'expected' => ['$mod' => ['$field', 5]],
-                'operator' => 'mod',
-                'args' => ['$field', 5],
-            ];
-
-            yield 'multiplyWithTwoArgs' => [
-                'expected' => ['$multiply' => ['$field', 5]],
-                'operator' => 'multiply',
-                'args' => ['$field', 5],
-            ];
-
-            yield 'multiplyWithMultipleArgs' => [
-                'expected' => ['$multiply' => ['$field', 5, '$otherField']],
-                'operator' => 'multiply',
-                'args' => ['$field', 5, '$otherField'],
-            ];
-
-            yield 'multiply' => [
-                'expected' => ['$multiply' => ['$field', 5]],
-                'operator' => 'multiply',
-                'args' => ['$field', 5],
-            ];
-
-            yield 'pow' => [
-                'expected' => ['$pow' => ['$number', '$exponent']],
-                'operator' => 'pow',
-                'args' => ['$number', '$exponent'],
-            ];
-
-            yield 'round' => [
-                'expected' => ['$round' => ['$number', '$place']],
-                'operator' => 'round',
-                'args' => ['$number', '$place'],
-            ];
-
-            yield 'sortArray' => [
-                'expected' => ['$sortArray' => ['input' => '$field', 'sortBy' => ['foo' => 1]]],
-                'operator' => 'sortArray',
-                'args' => ['$field', ['foo' => 1]],
-            ];
-
-            yield 'sqrt' => [
-                'expected' => ['$sqrt' => '$field'],
-                'operator' => 'sqrt',
-                'args' => ['$field'],
-            ];
-
-            yield 'subtract' => [
-                'expected' => ['$subtract' => ['$field', '$otherField']],
-                'operator' => 'subtract',
-                'args' => ['$field', '$otherField'],
-            ];
-
-            yield 'trunc' => [
-                'expected' => ['$trunc' => '$field'],
-                'operator' => 'trunc',
-                'args' => ['$field'],
-            ];
+        yield 'abs' => [
+            'expected' => ['$abs' => '$field'],
+            'operator' => 'abs',
+            'args' => ['$field'],
+        ];
+
+        yield 'addWithTwoArgs' => [
+            'expected' => ['$add' => [5, '$field']],
+            'operator' => 'add',
+            'args' => [5, '$field'],
+        ];
+
+        yield 'addWithMultipleArgs' => [
+            'expected' => ['$add' => [5, '$field', '$otherField', 4.99]],
+            'operator' => 'add',
+            'args' => [5, '$field', '$otherField', 4.99],
+        ];
+
+        yield 'ceil' => [
+            'expected' => ['$ceil' => '$field'],
+            'operator' => 'ceil',
+            'args' => ['$field'],
+        ];
+
+        yield 'divide' => [
+            'expected' => ['$divide' => ['$field', 5]],
+            'operator' => 'divide',
+            'args' => ['$field', 5],
+        ];
+
+        yield 'exp' => [
+            'expected' => ['$exp' => '$field'],
+            'operator' => 'exp',
+            'args' => ['$field'],
+        ];
+
+        yield 'floor' => [
+            'expected' => ['$floor' => '$field'],
+            'operator' => 'floor',
+            'args' => ['$field'],
+        ];
+
+        yield 'ln' => [
+            'expected' => ['$ln' => '$field'],
+            'operator' => 'ln',
+            'args' => ['$field'],
+        ];
+
+        yield 'log' => [
+            'expected' => ['$log' => ['$field', '$base']],
+            'operator' => 'log',
+            'args' => ['$field', '$base'],
+        ];
+
+        yield 'log10' => [
+            'expected' => ['$log10' => '$field'],
+            'operator' => 'log10',
+            'args' => ['$field'],
+        ];
+
+        yield 'mod' => [
+            'expected' => ['$mod' => ['$field', 5]],
+            'operator' => 'mod',
+            'args' => ['$field', 5],
+        ];
+
+        yield 'multiplyWithTwoArgs' => [
+            'expected' => ['$multiply' => ['$field', 5]],
+            'operator' => 'multiply',
+            'args' => ['$field', 5],
+        ];
+
+        yield 'multiplyWithMultipleArgs' => [
+            'expected' => ['$multiply' => ['$field', 5, '$otherField']],
+            'operator' => 'multiply',
+            'args' => ['$field', 5, '$otherField'],
+        ];
+
+        yield 'multiply' => [
+            'expected' => ['$multiply' => ['$field', 5]],
+            'operator' => 'multiply',
+            'args' => ['$field', 5],
+        ];
+
+        yield 'pow' => [
+            'expected' => ['$pow' => ['$number', '$exponent']],
+            'operator' => 'pow',
+            'args' => ['$number', '$exponent'],
+        ];
+
+        yield 'round' => [
+            'expected' => ['$round' => ['$number', '$place']],
+            'operator' => 'round',
+            'args' => ['$number', '$place'],
+        ];
+
+        yield 'sortArray' => [
+            'expected' => ['$sortArray' => ['input' => '$field', 'sortBy' => ['foo' => 1]]],
+            'operator' => 'sortArray',
+            'args' => ['$field', ['foo' => 1]],
+        ];
+
+        yield 'sqrt' => [
+            'expected' => ['$sqrt' => '$field'],
+            'operator' => 'sqrt',
+            'args' => ['$field'],
+        ];
+
+        yield 'subtract' => [
+            'expected' => ['$subtract' => ['$field', '$otherField']],
+            'operator' => 'subtract',
+            'args' => ['$field', '$otherField'],
+        ];
+
+        yield 'trunc' => [
+            'expected' => ['$trunc' => '$field'],
+            'operator' => 'trunc',
+            'args' => ['$field'],
+        ];
     }
 
     public static function provideArrayExpressionOperators(): Generator
@@ -251,12 +251,6 @@ public static function provideArrayExpressionOperators(): Generator
             'args' => ['$field', '$otherField', '$start', '$end'],
         ];
 
-        yield 'isArray' => [
-            'expected' => ['$isArray' => '$field'],
-            'operator' => 'isArray',
-            'args' => ['$field'],
-        ];
-
         yield 'last' => [
             'expected' => ['$last' => '$array'],
             'operator' => 'last',
@@ -291,12 +285,6 @@ public static function provideArrayExpressionOperators(): Generator
             'args' => ['$array', '$n'],
         ];
 
-        yield 'objectToArray' => [
-            'expected' => ['$objectToArray' => ['$obj']],
-            'operator' => 'objectToArray',
-            'args' => [['$obj']],
-        ];
-
         yield 'rangeWithoutStep' => [
             'expected' => ['$range' => ['$start', '$end']],
             'operator' => 'range',