From 2e5bac1f527d5671fb9b2f5d41a704bc21360455 Mon Sep 17 00:00:00 2001 From: Richard Miller Date: Mon, 27 Feb 2012 19:37:59 +0000 Subject: [PATCH] Removed filtering of null values in transformer --- Tests/Transformer/ModelToElasticaAutoTransformerTest.php | 8 +++----- Transformer/ModelToElasticaAutoTransformer.php | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Tests/Transformer/ModelToElasticaAutoTransformerTest.php b/Tests/Transformer/ModelToElasticaAutoTransformerTest.php index 4a6e160..0a987a0 100644 --- a/Tests/Transformer/ModelToElasticaAutoTransformerTest.php +++ b/Tests/Transformer/ModelToElasticaAutoTransformerTest.php @@ -148,15 +148,13 @@ class ModelToElasticaAutoTransformerTest extends \PHPUnit_Framework_TestCase ); } - public function testThatNullValuesAreFilteredOut() + public function testThatNullValuesAreNotFilteredOut() { $transformer = new ModelToElasticaAutoTransformer(); $document = $transformer->transform(new POPO(), array('nullValue')); $data = $document->getData(); - $this->assertInstanceOf('Elastica_Document', $document); - $this->assertEquals(123, $document->getId()); - $this->assertFalse(array_key_exists('nullValue', $data)); + $this->assertTrue(array_key_exists('nullValue', $data)); } /** @@ -165,6 +163,6 @@ class ModelToElasticaAutoTransformerTest extends \PHPUnit_Framework_TestCase public function testThatCannotTransformObjectWhenGetterDoesNotExists() { $transformer = new ModelToElasticaAutoTransformer(); - $document = $transformer->transform(new POPO(), array('desc')); + $transformer->transform(new POPO(), array('desc')); } } diff --git a/Transformer/ModelToElasticaAutoTransformer.php b/Transformer/ModelToElasticaAutoTransformer.php index 910d1cf..62170cd 100644 --- a/Transformer/ModelToElasticaAutoTransformer.php +++ b/Transformer/ModelToElasticaAutoTransformer.php @@ -49,9 +49,7 @@ class ModelToElasticaAutoTransformer implements ModelToElasticaTransformerInterf if (!method_exists($class, $getter)) { throw new RuntimeException(sprintf('The getter %s::%s does not exist', $class, $getter)); } - if (null !== $value = $this->normalizeValue($object->$getter())) { - $array[$key] = $value; - } + $array[$key] = $this->normalizeValue($object->$getter()); } $identifierGetter = 'get'.ucfirst($this->options['identifier']); $identifier = $object->$identifierGetter();