Fixes zendframework#5011

bnkr · Dec 11, 2013 · 5f8cb60 · 5f8cb60
1 parent 7b56572
commit 5f8cb60
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/library/Zend/Log/Formatter/Base.php b/library/Zend/Log/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/tests/ZendTest/Log/Formatter/BaseTest.php b/tests/ZendTest/Log/Formatter/BaseTest.php
@@ -157,4 +157,20 @@ public function testFormatNoInfiniteLoopOnSelfReferencingArrayValues()
 
         $this->assertEquals($outputExpected, $formatter->format($event));
     }
+
+    public function testFormatNonArrayExtrakey()
+    {
+        $formatter = new BaseFormatter();
+
+        $event = array(
+            'message'   => 'Hi',
+            'extra'     => '',
+        );
+        $outputExpected = array(
+            'message' => 'Hi',
+            'extra'   =>  '',
+        );
+
+        $this->assertEquals($outputExpected, $formatter->format($event));
+    }
 }
diff --git a/tests/ZendTest/Log/LoggerTest.php b/tests/ZendTest/Log/LoggerTest.php
@@ -366,4 +366,23 @@ public function testExceptionHandler()
             $this->assertEquals($expectedEvent['file'], $event['extra']['file'], 'Unexpected file');
         }
     }
+
+    public function testLogExtraArrayKey()
+    {
+        $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);
+    }
 }