Permalink
Browse files

Merge branch '2.0'

  • Loading branch information...
2 parents 8f5f123 + 9ec6a0a commit b12b92845c6edf267bad33f576a8161d7b2f3ff2 @jmikola jmikola committed Mar 7, 2013
@@ -149,7 +149,7 @@ public function testThatCanTransformObjectWithCorrectTypes()
$this->assertEquals(true, $data['bool']);
$this->assertEquals(false, $data['falseBool']);
$expectedDate = new \DateTime('1979-05-05');
- $this->assertEquals($expectedDate->format('U'), $data['date']);
+ $this->assertEquals($expectedDate->format('c'), $data['date']);
}
public function testThatCanTransformObjectWithIteratorValue()
@@ -186,7 +186,7 @@ public function testThatCanTransformObjectWithMultiDimensionalArrayValue()
$this->assertEquals(
array(
'key1' => 'value1',
- 'key2' => array('value2', false, 123, 8.9, $expectedDate->format('U')),
+ 'key2' => array('value2', false, 123, 8.9, $expectedDate->format('c')),
), $data['multiArray']
);
}
@@ -107,7 +107,7 @@ protected function normalizeValue($value)
$normalizeValue = function(&$v)
{
if ($v instanceof \DateTime) {
- $v = $v->format('v');
+ $v = $v->format('c');
} elseif (!is_scalar($v) && !is_null($v)) {
$v = (string)$v;
}

0 comments on commit b12b928

Please sign in to comment.