Simplify encoding of BackedEnum into an array

Author: GromNaN

src/Builder/BuilderEncoder.php

@@ -102,10 +102,6 @@ public function encode($value): stdClass|array|string
             throw new LogicException(sprintf('Class "%s" does not implement OperatorInterface.', $value::class));
         }
 
-        if ($value instanceof BackedEnum) {
-            return $this->encodeAsEnum($value);
-        }
-
         // The generic but incomplete encoding code
         switch ($value::ENCODE) {
             case Encode::Single:
@@ -129,21 +125,15 @@ public function encode($value): stdClass|array|string
         throw new LogicException(sprintf('Class "%s" does not have a valid ENCODE constant.', $value::class));
     }
 
-    private function encodeAsEnum(OperatorInterface&BackedEnum $value): stdClass
-    {
-        $val = $value->value;
-        if ($value::ENCODE === Encode::Array) {
-            $val = [$val];
-        }
-
-        return $this->wrap($value, $val);
-    }
-
     /**
      * Encode the value as an array of properties, in the order they are defined in the class.
      */
     private function encodeAsArray(OperatorInterface $value): stdClass
     {
+        if ($value instanceof BackedEnum) {
+            return $this->wrap($value, [$value->value]);
+        }
+
         $result = [];
         /** @var mixed $val */
         foreach (get_object_vars($value) as $val) {
@@ -221,6 +211,10 @@ private function encodeAsDollarObject(OperatorInterface $value): stdClass
      */
     private function encodeAsSingle(OperatorInterface $value): stdClass
     {
+        if ($value instanceof BackedEnum) {
+            return $this->wrap($value, $value->value);
+        }
+
         foreach (get_object_vars($value) as $val) {
             $result = $this->recursiveEncode($val);