Use BSON Type class instead of UTCDateTime

Author: alcaeus

src/Builder/BuilderEncoder.php

@@ -5,7 +5,7 @@
 namespace MongoDB\Builder;
 
 use DateTimeInterface;
-use MongoDB\BSON\UTCDateTime;
+use MongoDB\BSON\Type;
 use MongoDB\Builder\Encoder\CombinedFieldQueryEncoder;
 use MongoDB\Builder\Encoder\DateTimeEncoder;
 use MongoDB\Builder\Encoder\DictionaryEncoder;
@@ -34,10 +34,10 @@
 use function array_key_exists;
 use function is_object;
 
-/** @template-implements Encoder<stdClass|array|string|int, Pipeline|StageInterface|ExpressionInterface|QueryInterface> */
+/** @template-implements Encoder<Type|stdClass|array|string|int, Pipeline|StageInterface|ExpressionInterface|QueryInterface> */
 final class BuilderEncoder implements Encoder
 {
-    /** @template-use EncodeIfSupported<stdClass|array|string|int, Pipeline|StageInterface|ExpressionInterface|QueryInterface> */
+    /** @template-use EncodeIfSupported<Type|stdClass|array|string|int, Pipeline|StageInterface|ExpressionInterface|QueryInterface> */
     use EncodeIfSupported;
 
     /** @var array<class-string, class-string<ExpressionEncoder>> */
@@ -71,7 +71,7 @@ public function canEncode(mixed $value): bool
         return (bool) $this->getEncoderFor($value)?->canEncode($value);
     }
 
-    public function encode(mixed $value): stdClass|array|string|int|UTCDateTime
+    public function encode(mixed $value): Type|stdClass|array|string|int
     {
         $encoder = $this->getEncoderFor($value);
 

src/Builder/Encoder/AbstractExpressionEncoder.php

@@ -4,15 +4,15 @@
 
 namespace MongoDB\Builder\Encoder;
 
-use MongoDB\BSON\UTCDateTime;
+use MongoDB\BSON\Type;
 use MongoDB\Builder\BuilderEncoder;
 use stdClass;
 
 use function get_object_vars;
 use function is_array;
 
 /**
- * @template BSONType of stdClass|array|string|int|UTCDateTime
+ * @template BSONType of Type|stdClass|array|string|int
  * @template NativeType
  * @template-implements ExpressionEncoder<BSONType, NativeType>
  * @internal
@@ -26,6 +26,7 @@ final public function __construct(protected readonly BuilderEncoder $encoder)
     /**
      * Nested arrays and objects must be encoded recursively.
      *
+     * @psalm-template T
      * @psalm-param T $value
      *
      * @psalm-return (T is stdClass ? stdClass : (T is array ? array : mixed))

src/Builder/Encoder/ExpressionEncoder.php

@@ -4,12 +4,13 @@
 
 namespace MongoDB\Builder\Encoder;
 
+use MongoDB\BSON\Type;
 use MongoDB\Builder\BuilderEncoder;
 use MongoDB\Codec\Encoder;
 use stdClass;
 
 /**
- * @template BSONType of stdClass|array|string|int
+ * @template BSONType of Type|stdClass|array|string|int
  * @template NativeType
  * @template-extends Encoder<BSONType, NativeType>
  * @internal