Merge pull request zendframework/zendframework#5594 in master

zendframework · Jan 2, 2014 · 975bb98 · 975bb98
commit 975bb98
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/src/Formatter/Base.php b/src/Formatter/Base.php
@@ -54,7 +54,7 @@ public function format($event)
     {
         foreach ($event as $key => $value) {
             // Keep extra as an array
-            if ('extra' === $key) {
+            if ('extra' === $key && is_array($value)) {
                 $event[$key] = self::format($value);
             } else {
                 $event[$key] = $this->normalize($value);

diff --git a/test/Formatter/BaseTest.php b/test/Formatter/BaseTest.php
@@ -157,4 +157,20 @@ public function testFormatNoInfiniteLoopOnSelfReferencingArrayValues()
 
         $this->assertEquals($outputExpected, $formatter->format($event));
     }
+
+    public function testFormatExtraArrayKeyWithNonArrayValue()
+    {
+        $formatter = new BaseFormatter();
+
+        $event = array(
+            'message'   => 'Hi',
+            'extra'     => '',
+        );
+        $outputExpected = array(
+            'message' => 'Hi',
+            'extra'   =>  '',
+        );
+
+        $this->assertEquals($outputExpected, $formatter->format($event));
+    }
 }
diff --git a/test/LoggerTest.php b/test/LoggerTest.php
@@ -366,4 +366,23 @@ public function testExceptionHandler()
             $this->assertEquals($expectedEvent['file'], $event['extra']['file'], 'Unexpected file');
         }
     }
+
+    public function testLogExtraArrayKeyWithNonArrayValue()
+    {
+        $stream = fopen("php://memory", "r+");
+        $options = array(
+            'writers' => array(
+                array(
+                    'name'     => 'stream',
+                    'options'  => array(
+                        'stream' => $stream
+                    ),
+                ),
+            ),
+        );
+        $logger = new Logger($options);
+
+        $this->assertInstanceOf('Zend\Log\Logger', $logger->info('Hi', array('extra' => '')));
+        fclose($stream);
+    }
 }