wrapObject=false is only for encode object

Author: GromNaN

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 = [];

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>

src/Builder/Encoder/OperatorEncoder.php

@@ -12,6 +12,8 @@
 use MongoDB\Exception\UnsupportedValueException;
 use stdClass;
 
+use function assert;
+use function is_string;
 use function sprintf;
 
 /**
@@ -89,6 +91,10 @@ private function encodeAsObject(OperatorInterface $value): stdClass
             }
         }
 
+        if ($value::NAME === null) {
+            return $result;
+        }
+
         return $this->wrap($value, $result);
     }
 
@@ -106,16 +112,9 @@ private function encodeAsSingle(OperatorInterface $value): stdClass
         throw new LogicException(sprintf('Class "%s" does not have a single property.', $value::class));
     }
 
-    /**
-     * Wrap the result in an object if the operator has a name.
-     * The operator name is NULL, and the result is returned as is
-     * when wrapObject is false in the YAML configuration of the operator.
-     */
     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;