Rearrange object conversion for smaller complexity

Author: Riimu

src/Encoder/ObjectEncoder.php

@@ -42,7 +42,7 @@ public function encode($value, $depth, array $options, callable $encode)
 
     /**
      * Encodes the object as string according to encoding options.
-     * @param object $object Object to convert to code
+     * @param object $object Object to encode as PHP
      * @param array $options List of encoder options
      * @param callable $encode Callback used to encode values
      * @return string The object encoded as string
@@ -57,6 +57,22 @@ private function encodeObject($object, array $options, callable $encode)
             return sprintf('\\%s::__set_state(%s)', get_class($object), $encode($this->getObjectState($object)));
         }
 
+        return $this->encodeObjectArray($object, $options, $encode);
+    }
+
+    /**
+     * Encodes the object into one of the array formats.
+     * @param object $object Object to encode as PHP
+     * @param array $options List of encoder options
+     * @param callable $encode Callback used to encode values
+     * @return string The object encoded as string
+     */
+    private function encodeObjectArray($object, array $options, callable $encode)
+    {
+        if (!in_array($options['object.format'], ['array', 'vars', 'iterate'])) {
+            throw new \RuntimeException('Invalid object encoding format: ' . $options['object.format']);
+        }
+
         $output = $encode($this->getObjectArray($object, $options['object.format']));
 
         if ($options['object.cast']) {
@@ -79,15 +95,15 @@ private function getObjectArray($object, $format)
             return (array) $object;
         } elseif ($format === 'vars') {
             return get_object_vars($object);
-        } elseif ($format === 'iterate') {
-            $array = [];
-            foreach ($object as $key => $value) {
-                $array[$key] = $value;
-            }
-            return $array;
         }
 
-        throw new \RuntimeException('Invalid object encoding format: ' . $format);
+        $array = [];
+
+        foreach ($object as $key => $value) {
+            $array[$key] = $value;
+        }
+
+        return $array;
     }
 
     /**

tests/tests/EncodingTest.php

@@ -190,6 +190,20 @@ public function testIgnoredArrayRecursion()
         );
     }
 
+    public function testMaxDeathOnNoRecursionDetection()
+    {
+        $foo = [1];
+        $foo[1] = & $foo;
+
+        $encoder = new PHPEncoder([
+            'recursion.detect' => false,
+            'recursion.max' => 5
+        ]);
+
+        $this->setExpectedException('RuntimeException');
+        $encoder->encode($foo);
+    }
+
     private function assertEncode($value, $string, PHPEncoder $encoder, $initial = null)
     {
         $output = $encoder->encode(func_num_args() < 4 ? $value : $initial);