Change default implementation of Type::closureToPHP and remove closureToMongo

Author: GromNaN

src/Types/AbstractVectorType.php

@@ -72,25 +72,6 @@ public function convertToPHPValue(mixed $value): ?array
         return $value->toArray();
     }
 
-    public function closureToMongo(): string
-    {
-        return str_replace('%%vectorType%%', $this->getVectorType()->name, <<<'PHP'
-            if ($value === null) {
-                $return = null;
-            } elseif (\is_array($value)) {
-                $return = \MongoDB\BSON\Binary::fromVector($value, \MongoDB\BSON\VectorType::%%vectorType%%);
-            } elseif (! $value instanceof \MongoDB\BSON\Binary) {
-                throw new InvalidArgumentException(sprintf('Invalid data type %s received for vector field, expected null, array or MongoDB\BSON\Binary', get_debug_type($value)));
-            } elseif ($value->getType() !== \MongoDB\BSON\Binary::TYPE_VECTOR) {
-                throw new InvalidArgumentException(sprintf('Invalid binary data of type %d received for vector field, expected binary type %d', $value->getType(), \MongoDB\BSON\Binary::TYPE_VECTOR));
-            } elseif ($value->getVectorType() !== \MongoDB\BSON\VectorType::%%vectorType%%) {
-                throw new \InvalidArgumentException(sprintf('Invalid binary vector data of vector type %s received for vector field, expected vector type %%vectorType%%', $value->getVectorType()->name));
-            } else {
-                $return = $value;
-            }
-PHP);
-    }
-
     public function closureToPHP(): string
     {
         return str_replace('%%vectorType%%', $this->getVectorType()->name, <<<'PHP'

src/Types/BinDataType.php

@@ -6,8 +6,6 @@
 
 use MongoDB\BSON\Binary;
 
-use function sprintf;
-
 /**
  * The BinData type for generic data.
  */
@@ -42,11 +40,6 @@ public function convertToPHPValue(mixed $value): mixed
         return $value !== null ? ($value instanceof Binary ? $value->getData() : $value) : null;
     }
 
-    public function closureToMongo(): string
-    {
-        return sprintf('$return = $value !== null ? new \MongoDB\BSON\Binary($value, %d) : null;', $this->binDataType);
-    }
-
     public function closureToPHP(): string
     {
         return '$return = $value !== null ? ($value instanceof \MongoDB\BSON\Binary ? $value->getData() : $value) : null;';

src/Types/BinaryUuidType.php

@@ -42,19 +42,6 @@ public function convertToPHPValue(mixed $value): Uuid
         return Uuid::fromBinary($value->getData());
     }
 
-    public function closureToMongo(): string
-    {
-        return <<<'PHP'
-$return = match (true) {
-    $value === null => null,
-    $value instanceof \MongoDB\BSON\Binary => $value,
-    $value instanceof \Symfony\Component\Uid\Uuid => new \MongoDB\BSON\Binary($value->toBinary(), \MongoDB\BSON\Binary::TYPE_UUID),
-    is_string($value) => new \MongoDB\BSON\Binary(\Symfony\Component\Uid\Uuid::fromString($value)->toBinary(), \MongoDB\BSON\Binary::TYPE_UUID),
-    default => throw new \InvalidArgumentException(sprintf('Invalid data type %s received for UUID', get_debug_type($value))),
-};
-PHP;
-    }
-
     public function closureToPHP(): string
     {
         return <<<'PHP'

src/Types/BooleanType.php

@@ -19,11 +19,6 @@ public function convertToPHPValue(mixed $value): ?bool
         return $value !== null ? (bool) $value : null;
     }
 
-    public function closureToMongo(): string
-    {
-        return '$return = (bool) $value;';
-    }
-
     public function closureToPHP(): string
     {
         return '$return = (bool) $value;';

src/Types/ClosureToPHP.php

@@ -6,7 +6,11 @@
 
 use function sprintf;
 
-/** This trait will be deprecated in 3.0 as this behavior will be used by default */
+/**
+ * @deprecated Since 3.0, the default {@Type::closureToPHP()} implementation is identical and this trait is no longer needed.
+ *
+ * @phpstan-ignore trait.unused
+ */
 trait ClosureToPHP
 {
     /** @return string Redirects to the method convertToPHPValue from child class */

src/Types/CustomIdType.php

@@ -19,11 +19,6 @@ public function convertToPHPValue(mixed $value): mixed
         return $value;
     }
 
-    public function closureToMongo(): string
-    {
-        return '$return = $value;';
-    }
-
     public function closureToPHP(): string
     {
         return '$return = $value;';

src/Types/DateType.php

@@ -101,11 +101,6 @@ public function convertToPHPValue(mixed $value): ?DateTimeInterface
         return static::getDateTime($value);
     }
 
-    public function closureToMongo(): string
-    {
-        return 'if ($value === null || $value instanceof \MongoDB\BSON\UTCDateTime) { $return = $value; } else { $datetime = \\' . static::class . '::getDateTime($value); $return = new \MongoDB\BSON\UTCDateTime($datetime); }';
-    }
-
     public function closureToPHP(): string
     {
         return 'if ($value === null) { $return = null; } else { $return = \\' . static::class . '::getDateTime($value); }';

src/Types/Decimal128Type.php

@@ -11,8 +11,6 @@
 
 class Decimal128Type extends Type implements Incrementable, Versionable
 {
-    use ClosureToPHP;
-
     public function convertToDatabaseValue(mixed $value): ?Decimal128
     {
         if ($value === null) {

src/Types/FloatType.php

@@ -19,11 +19,6 @@ public function convertToPHPValue(mixed $value): ?float
         return $value !== null ? (float) $value : null;
     }
 
-    public function closureToMongo(): string
-    {
-        return '$return = (float) $value;';
-    }
-
     public function closureToPHP(): string
     {
         return '$return = (float) $value;';

src/Types/IdType.php

@@ -34,11 +34,6 @@ public function convertToPHPValue(mixed $value): mixed
         return $value instanceof ObjectId ? (string) $value : $value;
     }
 
-    public function closureToMongo(): string
-    {
-        return '$return = new MongoDB\BSON\ObjectId($value);';
-    }
-
     public function closureToPHP(): string
     {
         return '$return = $value instanceof \MongoDB\BSON\ObjectId ? (string) $value : $value;';