Merge branch 'hotfix/4616'

Close zendframework/zendframework#4616
Fixes zendframework/zendframework#4614

src/Formatter/Base.php

@@ -11,6 +11,7 @@
 
 use DateTime;
 use Traversable;
+use Zend\Stdlib\ErrorHandler;
 
 class Base implements FormatterInterface
 {
@@ -75,23 +76,29 @@ protected function normalize($value)
             return $value;
         }
 
+        // better readable JSON
+        static $jsonFlags;
+        if ($jsonFlags === null) {
+            $jsonFlags = 0;
+            $jsonFlags |= defined('JSON_UNESCAPED_SLASHES') ? JSON_UNESCAPED_SLASHES : 0;
+            $jsonFlags |= defined('JSON_UNESCAPED_UNICODE') ? JSON_UNESCAPED_UNICODE : 0;
+        }
+
+        ErrorHandler::start();
         if ($value instanceof DateTime) {
             $value = $value->format($this->getDateTimeFormat());
-        } elseif (is_array($value) || $value instanceof Traversable) {
-            if ($value instanceof Traversable) {
-                $value = iterator_to_array($value);
-            }
-            foreach ($value as $key => $subvalue) {
-                $value[$key] = $this->normalize($subvalue);
-            }
-            $value = json_encode($value);
+        } elseif ($value instanceof Traversable) {
+            $value = json_encode(iterator_to_array($value), $jsonFlags);
+        } elseif (is_array($value)) {
+            $value = json_encode($value, $jsonFlags);
         } elseif (is_object($value) && !method_exists($value, '__toString')) {
             $value = sprintf('object(%s) %s', get_class($value), json_encode($value));
         } elseif (is_resource($value)) {
             $value = sprintf('resource(%s)', get_resource_type($value));
         } elseif (!is_object($value)) {
             $value = gettype($value);
         }
+        ErrorHandler::stop();
 
         return (string) $value;
     }

test/Formatter/BaseTest.php

@@ -121,4 +121,32 @@ public function testFormatAllTypes()
 
         $this->assertEquals($outputExpected, $formatter->format($event));
     }
+
+    public function testFormatNoInfiniteLoopOnSelfReferencingArrayValues()
+    {
+        $datetime  = new DateTime();
+        $formatter = new BaseFormatter();
+
+        $selfRefArr = array();
+        $selfRefArr['selfRefArr'] = & $selfRefArr;
+
+        $event = array(
+            'timestamp' => $datetime,
+            'priority'  => 1,
+            'message'   => 'tottakai',
+            'extra' => array(
+                'selfRefArr' => $selfRefArr,
+            ),
+        );
+        $outputExpected = array(
+            'timestamp' => $datetime->format($formatter->getDateTimeFormat()),
+            'priority'  => 1,
+            'message'   => 'tottakai',
+            'extra' => array(
+                'selfRefArr' => '{"selfRefArr":{"selfRefArr":null}}',
+            ),
+        );
+
+        $this->assertEquals($outputExpected, $formatter->format($event));
+    }
 }