This repository has been archived by the owner on Jan 30, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix/log-db-formatter'
- Loading branch information
42 parents
76607e3
+
492076c
+
17b56b8
+
c5509fe
+
e0fa433
+
7d74e99
+
309136e
+
fe78a35
+
f6430c3
+
6041a1e
+
86b9031
+
674bd75
+
67a1bfb
+
4d4dd8b
+
c655082
+
dbb18b2
+
97a9134
+
80367df
+
98d5255
+
7946c9f
+
ea67c13
+
44df0b2
+
38e090d
+
7af74e7
+
8b311b1
+
e2c2b94
+
51601cb
+
dcc1eaf
+
6f4b805
+
a30a64f
+
ee7347d
+
8b04bfe
+
b487f00
+
ecdfdf6
+
d8cde75
+
b7a33bb
+
65ecb58
+
f1dd38a
+
7be533f
+
6a618c2
+
3a454e3
+
4176aeb
commit f94838d
Showing
4 changed files
with
189 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
* @package Zend_Log | ||
*/ | ||
|
||
namespace Zend\Log\Formatter; | ||
|
||
use DateTime; | ||
use Zend\Log\Exception; | ||
|
||
/** | ||
* @category Zend | ||
* @package Zend_Log | ||
* @subpackage Formatter | ||
*/ | ||
class Db implements FormatterInterface | ||
{ | ||
/** | ||
* Format specifier for DateTime objects in event data (default: ISO 8601) | ||
* | ||
* @see http://php.net/manual/en/function.date.php | ||
* @var string | ||
*/ | ||
protected $dateTimeFormat = self::DEFAULT_DATETIME_FORMAT; | ||
|
||
/** | ||
* Class constructor | ||
* | ||
* @see http://php.net/manual/en/function.date.php | ||
* @param null|string $dateTimeFormat Format specifier for DateTime objects in event data | ||
*/ | ||
public function __construct($dateTimeFormat = null) | ||
{ | ||
if (null !== $dateTimeFormat) { | ||
$this->setDateTimeFormat($dateTimeFormat); | ||
} | ||
} | ||
|
||
/** | ||
* Formats data to be written by the writer. | ||
* | ||
* @param array $event event data | ||
* @return array | ||
*/ | ||
public function format($event) | ||
{ | ||
$format = $this->getDateTimeFormat(); | ||
array_walk_recursive($event, function (&$value) use ($format) { | ||
if ($value instanceof DateTime) { | ||
$value = $value->format($format); | ||
} | ||
}); | ||
|
||
return $event; | ||
} | ||
|
||
/** | ||
* {@inheritDoc} | ||
*/ | ||
public function getDateTimeFormat() | ||
{ | ||
return $this->dateTimeFormat; | ||
} | ||
|
||
/** | ||
* {@inheritDoc} | ||
*/ | ||
public function setDateTimeFormat($dateTimeFormat) | ||
{ | ||
$this->dateTimeFormat = (string) $dateTimeFormat; | ||
return $this; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
* @package Zend_Log | ||
*/ | ||
|
||
namespace ZendTest\Log\Formatter; | ||
|
||
use DateTime; | ||
use ZendTest\Log\TestAsset\StringObject; | ||
use Zend\Log\Formatter\Db as DbFormatter; | ||
|
||
/** | ||
* @category Zend | ||
* @package Zend_Log | ||
* @subpackage UnitTests | ||
* @group Zend_Log | ||
*/ | ||
class DbTest extends \PHPUnit_Framework_TestCase | ||
{ | ||
public function testDefaultDateTimeFormat() | ||
{ | ||
$formatter = new DbFormatter(); | ||
$this->assertEquals(DbFormatter::DEFAULT_DATETIME_FORMAT, $formatter->getDateTimeFormat()); | ||
} | ||
|
||
/** | ||
* @dataProvider provideDateTimeFormats | ||
*/ | ||
public function testSetDateTimeFormat($dateTimeFormat) | ||
{ | ||
$formatter = new DbFormatter(); | ||
$formatter->setDateTimeFormat($dateTimeFormat); | ||
|
||
$this->assertEquals($dateTimeFormat, $formatter->getDateTimeFormat()); | ||
} | ||
|
||
/** | ||
* @return array | ||
*/ | ||
public function provideDateTimeFormats() | ||
{ | ||
return array( | ||
array('r'), | ||
array('U'), | ||
array(DateTime::RSS), | ||
); | ||
} | ||
|
||
/** | ||
* @dataProvider provideDateTimeFormats | ||
*/ | ||
public function testAllowsSpecifyingDateTimeFormatAsConstructorArgument($dateTimeFormat) | ||
{ | ||
$formatter = new DbFormatter($dateTimeFormat); | ||
|
||
$this->assertEquals($dateTimeFormat, $formatter->getDateTimeFormat()); | ||
} | ||
|
||
public function testFormatDateTimeInEvent() | ||
{ | ||
$datetime = new DateTime(); | ||
$event = array('timestamp' => $datetime); | ||
$formatter = new DbFormatter(); | ||
|
||
$format = DbFormatter::DEFAULT_DATETIME_FORMAT; | ||
$this->assertContains($datetime->format($format), $formatter->format($event)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters