Merge v1.x into v2.x (mongodb#1614)

Author: mongodb-php-bot

generator/config/expressions.php

@@ -6,6 +6,7 @@
 
 namespace MongoDB\Builder\Expression;
 
+use DateTimeInterface;
 use MongoDB\BSON;
 use MongoDB\Builder\Pipeline;
 use MongoDB\Builder\Type;
@@ -26,7 +27,7 @@
     'binData' => ['string', BSON\Binary::class],
     'objectId' => [BSON\ObjectId::class],
     'bool' => ['bool'],
-    'date' => [BSON\UTCDateTime::class],
+    'date' => [BSON\UTCDateTime::class, DateTimeInterface::class],
     'null' => ['null'],
     'regex' => [BSON\Regex::class],
     'javascript' => ['string', BSON\Javascript::class],
@@ -37,7 +38,7 @@
 ];
 
 // "any" accepts all the BSON types. No generic "object" or "mixed"
-$bsonTypes['any'] = ['bool', 'int', 'float', 'string', 'array', 'null', stdClass::class, BSON\Type::class];
+$bsonTypes['any'] = ['bool', 'int', 'float', 'string', 'array', 'null', stdClass::class, BSON\Type::class, DateTimeInterface::class];
 
 // "number" accepts all the numeric types
 $bsonTypes['number'] = ['int', 'float', BSON\Int64::class, BSON\Decimal128::class];

psalm-baseline.xml

@@ -40,12 +40,10 @@
       <code><![CDATA[stdClass]]></code>
     </MoreSpecificReturnType>
   </file>
-  <file src="src/Builder/Encoder/AbstractExpressionEncoder.php">
-    <MixedAssignment>
-      <code><![CDATA[$val]]></code>
-      <code><![CDATA[$val]]></code>
-      <code><![CDATA[$value[$key]]]></code>
-    </MixedAssignment>
+  <file src="src/Builder/BuilderEncoder.php">
+    <MixedReturnStatement>
+      <code><![CDATA[$encoder->encode($value)]]></code>
+    </MixedReturnStatement>
   </file>
   <file src="src/Builder/Encoder/CombinedFieldQueryEncoder.php">
     <MixedAssignment>
@@ -98,6 +96,13 @@
       <code><![CDATA[$value]]></code>
     </MixedAssignment>
   </file>
+  <file src="src/Builder/Encoder/RecursiveEncode.php">
+    <MixedAssignment>
+      <code><![CDATA[$val]]></code>
+      <code><![CDATA[$val]]></code>
+      <code><![CDATA[$value[$key]]]></code>
+    </MixedAssignment>
+  </file>
   <file src="src/Builder/Query.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$query]]></code>
@@ -239,6 +244,8 @@
       <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
       <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
       <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
+      <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
+      <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
     </InvalidReturnType>
     <MixedArgumentTypeCoercion>
       <code><![CDATA[$value]]></code>