From 4f5002a05280e56d2a00ba1d8defef6539d47066 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Thu, 13 Sep 2012 14:15:10 -0500 Subject: [PATCH] [ZF2-549][zendframework/zf2#2342] CS fixes - Trailing whitespace --- src/Formatter/ErrorHandler.php | 8 ++++---- test/Formatter/ErrorHandlerTest.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Formatter/ErrorHandler.php b/src/Formatter/ErrorHandler.php index 9f3db66a..2bca2ea6 100644 --- a/src/Formatter/ErrorHandler.php +++ b/src/Formatter/ErrorHandler.php @@ -35,11 +35,11 @@ public function format($event) if (isset($event['timestamp']) && $event['timestamp'] instanceof DateTime) { $event['timestamp'] = $event['timestamp']->format($this->getDateTimeFormat()); } - + foreach ($this->buildReplacementsFromArray($event) as $name => $value) { $output = str_replace("%$name%", $value, $output); } - + return $output; } @@ -47,8 +47,8 @@ public function format($event) * Flatten the multi-dimensional $event array into a single dimensional * array * - * @param array $event - * @param string $key + * @param array $event + * @param string $key * @return array */ protected function buildReplacementsFromArray ($event, $key = null) diff --git a/test/Formatter/ErrorHandlerTest.php b/test/Formatter/ErrorHandlerTest.php index e70ebd4d..fa8eff84 100644 --- a/test/Formatter/ErrorHandlerTest.php +++ b/test/Formatter/ErrorHandlerTest.php @@ -36,7 +36,7 @@ public function testFormat() 'errno' => 1, 'file' => 'test.php', 'line' => 1, - 'context' => array('object' => new DateTime(), 'string' => 'test') + 'context' => array('object' => new DateTime(), 'string' => 'test') ) ); $formatter = new ErrorHandler(); @@ -82,6 +82,6 @@ public function testComplexEvent () $output = $formatter->format($event); $this->assertEquals($stringObject->__toString() .' %extra[context][object2]% test1 %extra[context][array]% test2', $output); } - - + + }