wrapObject=false is only for encode object

mongodb · Dec 3, 2024 · 6848b94 · 6848b94
1 parent 2c805b6
commit 6848b94
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/generator/src/Definition/OperatorDefinition.php b/generator/src/Definition/OperatorDefinition.php
@@ -43,6 +43,10 @@ public function __construct(
             default => throw new UnexpectedValueException(sprintf('Unexpected "encode" value for operator "%s". Got "%s"', $name, $encode)),
         };
 
+        if (!$wrapObject && $this->encode !== Encode::Object) {
+            throw new UnexpectedValueException(sprintf('Operator "%s" cannot have wrapObject set to false when encode is not "object"', $name));
+        }
+
         // Convert arguments to ArgumentDefinition objects
         // Optional arguments must be after required arguments
         $requiredArgs = $optionalArgs = [];

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -75,12 +75,6 @@
       <code><![CDATA[$val]]></code>
       <code><![CDATA[$val]]></code>
     </MixedAssignment>
-    <MixedInferredReturnType>
-      <code><![CDATA[stdClass]]></code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement>
-      <code><![CDATA[$result]]></code>
-    </MixedReturnStatement>
     <PossibleRawObjectIteration>
       <code><![CDATA[$val]]></code>
     </PossibleRawObjectIteration>

diff --git a/src/Builder/Encoder/OperatorEncoder.php b/src/Builder/Encoder/OperatorEncoder.php
@@ -89,6 +89,10 @@ private function encodeAsObject(OperatorInterface $value): stdClass
             }
         }
 
+        if ($value::NAME === null) {
+            return $result;
+        }
+
         return $this->wrap($value, $result);
     }
 
@@ -113,9 +117,7 @@ private function encodeAsSingle(OperatorInterface $value): stdClass
      */
     private function wrap(OperatorInterface $value, mixed $result): stdClass
     {
-        if ($value::NAME === null) {
-            return $result;
-        }
+        assert(is_string($value::NAME));
 
         $object = new stdClass();
         $object->{$value::NAME} = $result;