Remove AbstractExpressionEncoder and ExpressionEncoder interface

Author: GromNaN

psalm-baseline.xml

@@ -46,13 +46,6 @@
       <code><![CDATA[$encoder->encode($value)]]></code>
     </MixedReturnStatement>
   </file>
-  <file src="src/Builder/Encoder/AbstractExpressionEncoder.php">
-    <MixedAssignment>
-      <code><![CDATA[$val]]></code>
-      <code><![CDATA[$val]]></code>
-      <code><![CDATA[$value[$key]]]></code>
-    </MixedAssignment>
-  </file>
   <file src="src/Builder/Encoder/CombinedFieldQueryEncoder.php">
     <MixedAssignment>
       <code><![CDATA[$filter]]></code>
@@ -104,6 +97,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>

src/Builder/BuilderEncoder.php

@@ -6,7 +6,6 @@
 
 use MongoDB\Builder\Encoder\CombinedFieldQueryEncoder;
 use MongoDB\Builder\Encoder\DictionaryEncoder;
-use MongoDB\Builder\Encoder\ExpressionEncoder;
 use MongoDB\Builder\Encoder\FieldPathEncoder;
 use MongoDB\Builder\Encoder\OperatorEncoder;
 use MongoDB\Builder\Encoder\OutputWindowEncoder;
@@ -30,14 +29,15 @@
 
 use function array_key_exists;
 use function is_object;
+use function is_string;
 
 /** @template-implements Encoder<stdClass|array|string|int, Pipeline|StageInterface|ExpressionInterface|QueryInterface> */
 final class BuilderEncoder implements Encoder
 {
     /** @template-use EncodeIfSupported<stdClass|array|string|int, Pipeline|StageInterface|ExpressionInterface|QueryInterface> */
     use EncodeIfSupported;
 
-    /** @var array<class-string, class-string<ExpressionEncoder>> */
+    /** @var array<class-string, class-string<Encoder>> */
     private array $defaultEncoders = [
         Pipeline::class => PipelineEncoder::class,
         Variable::class => VariableEncoder::class,

src/Builder/Encoder/CombinedFieldQueryEncoder.php

@@ -7,6 +7,7 @@
 use LogicException;
 use MongoDB\Builder\Type\CombinedFieldQuery;
 use MongoDB\Codec\EncodeIfSupported;
+use MongoDB\Codec\Encoder;
 use MongoDB\Exception\UnsupportedValueException;
 use stdClass;
 
@@ -17,13 +18,14 @@
 use function sprintf;
 
 /**
- * @template-extends AbstractExpressionEncoder<stdClass, CombinedFieldQuery>
+ * @template-implements Encoder<stdClass, CombinedFieldQuery>
  * @internal
  */
-final class CombinedFieldQueryEncoder extends AbstractExpressionEncoder
+final class CombinedFieldQueryEncoder implements Encoder
 {
     /** @template-use EncodeIfSupported<stdClass, CombinedFieldQuery> */
     use EncodeIfSupported;
+    use RecursiveEncode;
 
     public function canEncode(mixed $value): bool
     {

src/Builder/Encoder/DictionaryEncoder.php

@@ -6,14 +6,15 @@
 
 use MongoDB\Builder\Type\DictionaryInterface;
 use MongoDB\Codec\EncodeIfSupported;
+use MongoDB\Codec\Encoder;
 use MongoDB\Exception\UnsupportedValueException;
 use stdClass;
 
 /**
- * @template-extends AbstractExpressionEncoder<string|int|array|stdClass, DictionaryInterface>
+ * @template-implements Encoder<string|int|array|stdClass, DictionaryInterface>
  * @internal
  */
-final class DictionaryEncoder extends AbstractExpressionEncoder
+final class DictionaryEncoder implements Encoder
 {
     /** @template-use EncodeIfSupported<string|int|array|stdClass, DictionaryInterface> */
     use EncodeIfSupported;

src/Builder/Encoder/ExpressionEncoder.php

@@ -6,13 +6,14 @@
 
 use MongoDB\Builder\Type\FieldPathInterface;
 use MongoDB\Codec\EncodeIfSupported;
+use MongoDB\Codec\Encoder;
 use MongoDB\Exception\UnsupportedValueException;
 
 /**
- * @template-extends AbstractExpressionEncoder<string, FieldPathInterface>
+ * @template-implements Encoder<string, FieldPathInterface>
  * @internal
  */
-final class FieldPathEncoder extends AbstractExpressionEncoder
+final class FieldPathEncoder implements Encoder
 {
     /** @template-use EncodeIfSupported<string, FieldPathInterface> */
     use EncodeIfSupported;

src/Builder/Encoder/FieldPathEncoder.php

@@ -9,6 +9,7 @@
 use MongoDB\Builder\Type\OperatorInterface;
 use MongoDB\Builder\Type\Optional;
 use MongoDB\Codec\EncodeIfSupported;
+use MongoDB\Codec\Encoder;
 use MongoDB\Exception\UnsupportedValueException;
 use stdClass;
 
@@ -17,13 +18,14 @@
 use function sprintf;
 
 /**
- * @template-extends AbstractExpressionEncoder<stdClass, OperatorInterface>
+ * @template-implements Encoder<stdClass, OperatorInterface>
  * @internal
  */
-final class OperatorEncoder extends AbstractExpressionEncoder
+final class OperatorEncoder implements Encoder
 {
     /** @template-use EncodeIfSupported<stdClass, OperatorInterface> */
     use EncodeIfSupported;
+    use RecursiveEncode;
 
     public function canEncode(mixed $value): bool
     {

src/Builder/Encoder/OperatorEncoder.php

@@ -9,6 +9,7 @@
 use MongoDB\Builder\Type\OutputWindow;
 use MongoDB\Builder\Type\WindowInterface;
 use MongoDB\Codec\EncodeIfSupported;
+use MongoDB\Codec\Encoder;
 use MongoDB\Exception\UnsupportedValueException;
 use stdClass;
 
@@ -18,13 +19,14 @@
 use function sprintf;
 
 /**
- * @template-extends AbstractExpressionEncoder<stdClass, OutputWindow>
+ * @template-implements Encoder<stdClass, OutputWindow>
  * @internal
  */
-final class OutputWindowEncoder extends AbstractExpressionEncoder
+final class OutputWindowEncoder implements Encoder
 {
     /** @template-use EncodeIfSupported<stdClass, OutputWindow> */
     use EncodeIfSupported;
+    use RecursiveEncode;
 
     public function canEncode(mixed $value): bool
     {

src/Builder/Encoder/OutputWindowEncoder.php

@@ -6,16 +6,18 @@
 
 use MongoDB\Builder\Pipeline;
 use MongoDB\Codec\EncodeIfSupported;
+use MongoDB\Codec\Encoder;
 use MongoDB\Exception\UnsupportedValueException;
 
 /**
- * @template-extends AbstractExpressionEncoder<list<mixed>, Pipeline>
+ * @template-implements Encoder<list<mixed>, Pipeline>
  * @internal
  */
-final class PipelineEncoder extends AbstractExpressionEncoder
+final class PipelineEncoder implements Encoder
 {
     /** @template-use EncodeIfSupported<list<mixed>, Pipeline> */
     use EncodeIfSupported;
+    use RecursiveEncode;
 
     /** @psalm-assert-if-true Pipeline $value */
     public function canEncode(mixed $value): bool
@@ -32,7 +34,7 @@ public function encode(mixed $value): array
 
         $encoded = [];
         foreach ($value->getIterator() as $stage) {
-            $encoded[] = $this->encoder->encodeIfSupported($stage);
+            $encoded[] = $this->recursiveEncode($stage);
         }
 
         return $encoded;

src/Builder/Encoder/PipelineEncoder.php

@@ -8,6 +8,7 @@
 use MongoDB\Builder\Type\QueryInterface;
 use MongoDB\Builder\Type\QueryObject;
 use MongoDB\Codec\EncodeIfSupported;
+use MongoDB\Codec\Encoder;
 use MongoDB\Exception\UnsupportedValueException;
 use stdClass;
 
@@ -16,13 +17,14 @@
 use function sprintf;
 
 /**
- * @template-extends AbstractExpressionEncoder<stdClass, QueryObject>
+ * @template-implements Encoder<stdClass, QueryObject>
  * @internal
  */
-final class QueryEncoder extends AbstractExpressionEncoder
+final class QueryEncoder implements Encoder
 {
     /** @template-use EncodeIfSupported<stdClass, QueryObject> */
     use EncodeIfSupported;
+    use RecursiveEncode;
 
     public function canEncode(mixed $value): bool
     {

src/Builder/Encoder/QueryEncoder.php

@@ -10,13 +10,7 @@
 use function get_object_vars;
 use function is_array;
 
-/**
- * @template BSONType of stdClass|array|string|int
- * @template NativeType
- * @template-implements ExpressionEncoder<BSONType, NativeType>
- * @internal
- */
-abstract class AbstractExpressionEncoder implements ExpressionEncoder
+trait RecursiveEncode
 {
     final public function __construct(protected readonly BuilderEncoder $encoder)
     {
@@ -31,7 +25,7 @@ final public function __construct(protected readonly BuilderEncoder $encoder)
      *
      * @template T
      */
-    final protected function recursiveEncode(mixed $value): mixed
+    private function recursiveEncode(mixed $value): mixed
     {
         if (is_array($value)) {
             foreach ($value as $key => $val) {

src/Builder/Encoder/AbstractExpressionEncoder.php renamed to src/Builder/Encoder/RecursiveEncode.php

@@ -6,13 +6,14 @@
 
 use MongoDB\Builder\Expression\Variable;
 use MongoDB\Codec\EncodeIfSupported;
+use MongoDB\Codec\Encoder;
 use MongoDB\Exception\UnsupportedValueException;
 
 /**
- * @template-extends AbstractExpressionEncoder<string, Variable>
+ * @template-implements Encoder<string, Variable>
  * @internal
  */
-final class VariableEncoder extends AbstractExpressionEncoder
+final class VariableEncoder implements Encoder
 {
     /** @template-use EncodeIfSupported<string, Variable> */
     use EncodeIfSupported;