Merge branch '1.0.x'

doctrine · Jul 27, 2016 · 4aa45f5 · 4aa45f5
2 parents 626f5f6 + 06c4cad
commit 4aa45f5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php b/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php
@@ -231,9 +231,13 @@ private function generateHydratorClass(ClassMetadata $class, $hydratorClassName,
                 $code .= sprintf(<<<EOF
 
         /** @Field(type="{$mapping['type']}") */
-        if (isset(\$data['%1\$s'])) {
+        if (isset(\$data['%1\$s']) || (! empty(\$this->class->fieldMappings['%2\$s']['nullable']) && array_key_exists('%1\$s', \$data))) {
             \$value = \$data['%1\$s'];
-            %3\$s
+            if (\$value !== null) {
+                %3\$s
+            } else {
+                \$return = null;
+            }
             \$this->class->reflFields['%2\$s']->setValue(\$document, \$return);
             \$hydratedData['%2\$s'] = \$return;
         }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/HydratorTest.php b/tests/Doctrine/ODM/MongoDB/Tests/HydratorTest.php
@@ -14,6 +14,7 @@ public function testHydrator()
         $user = new HydrationClosureUser();
         $this->dm->getHydratorFactory()->hydrate($user, array(
             '_id' => 1,
+            'title' => null,
             'name' => 'jon',
             'birthdate' => new \DateTime('1961-01-01'),
             'referenceOne' => array('$id' => '1'),
@@ -32,6 +33,7 @@ public function testHydrator()
         ));
 
         $this->assertEquals(1, $user->id);
+        $this->assertSame(null, $user->title);
         $this->assertEquals('jon', $user->name);
         $this->assertInstanceOf('DateTime', $user->birthdate);
         $this->assertInstanceOf(__NAMESPACE__.'\HydrationClosureReferenceOne', $user->referenceOne);
@@ -70,6 +72,9 @@ class HydrationClosureUser
     /** @ODM\Id */
     public $id;
 
+    /** @ODM\Field(type="string", nullable=true) */
+    public $title = 'Mr.';
+
     /** @ODM\Field(type="string") */
     public $name;