From 1a6fe2c362531a5e211260a97b7e1d8802d99c2f Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Thu, 7 Mar 2013 17:50:37 -0500 Subject: [PATCH 1/2] Fix format typo for ISO 8601 date conversion See: dd00409e85e2f3b17edc43cbd347f2d5be6dda76 (typo on my part when cherry-picking that commit). --- Transformer/ModelToElasticaAutoTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Transformer/ModelToElasticaAutoTransformer.php b/Transformer/ModelToElasticaAutoTransformer.php index 9e1a383..638bfcc 100644 --- a/Transformer/ModelToElasticaAutoTransformer.php +++ b/Transformer/ModelToElasticaAutoTransformer.php @@ -67,7 +67,7 @@ class ModelToElasticaAutoTransformer implements ModelToElasticaTransformerInterf { $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; } From 9ec6a0ae1b03ed6c2b90c2d70511d09e2e554b48 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Thu, 7 Mar 2013 17:53:08 -0500 Subject: [PATCH 2/2] Update test assertions for date format --- Tests/Transformer/ModelToElasticaAutoTransformerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/Transformer/ModelToElasticaAutoTransformerTest.php b/Tests/Transformer/ModelToElasticaAutoTransformerTest.php index 0a987a0..b001d7a 100644 --- a/Tests/Transformer/ModelToElasticaAutoTransformerTest.php +++ b/Tests/Transformer/ModelToElasticaAutoTransformerTest.php @@ -111,7 +111,7 @@ class ModelToElasticaAutoTransformerTest extends \PHPUnit_Framework_TestCase $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() @@ -143,7 +143,7 @@ class ModelToElasticaAutoTransformerTest extends \PHPUnit_Framework_TestCase $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'] ); }