Merge pull request #37 from doctrine/GH-36-BugfixTypedNullable

[GH-36] Bugfix: TypedNoDefaultReflectionProperty::setValue NULL when null allowed

.scrutinizer.yml

@@ -16,7 +16,7 @@ build:
                     - phpcs-run
     dependencies:
         override:
-            - composer install -noa
+            - COMPOSER_ROOT_VERSION=1.2 composer install -noa
 
 tools:
     external_code_coverage:

.travis.yml

@@ -2,6 +2,10 @@ dist: trusty
 sudo: false
 language: php
 
+env:
+  global:
+    - COMPOSER_ROOT_VERSION=1.2
+
 cache:
   directories:
     - $HOME/.composer/cache

lib/Doctrine/Common/Reflection/TypedNoDefaultReflectionProperty.php

@@ -31,7 +31,7 @@ class TypedNoDefaultReflectionProperty extends ReflectionProperty
      */
     public function setValue($object, $value = null)
     {
-        if ($value === null) {
+        if ($value === null && $this->hasType() && ! $this->getType()->allowsNull()) {
             $propertyName = $this->getName();
 
             $unsetter = function () use ($propertyName) {

tests/Doctrine/Tests_PHP74/Common/Reflection/TypedNoDefaultReflectionPropertyTest.php

@@ -32,9 +32,26 @@ class TypedNoDefaultReflectionPropertyTest extends TestCase
         $object = new TypedFoo();
         $object->setId(1);
 
+        self::assertTrue($reflection->isInitialized($object));
+
         $reflection->setValue($object, null);
 
         self::assertNull($reflection->getValue($object));
+        self::assertFalse($reflection->isInitialized($object));
+    }
+
+    public function testSetValueNullOnNullableProperty() : void
+    {
+        $reflection = new TypedNoDefaultReflectionProperty(TypedNullableFoo::class, 'value');
+        $reflection->setAccessible(true);
+
+        $object = new TypedNullableFoo();
+
+        $reflection->setValue($object, null);
+
+        self::assertNull($reflection->getValue($object));
+        self::assertTrue($reflection->isInitialized($object));
+        self::assertNull($object->getValue());
     }
 }
 
@@ -52,3 +69,18 @@ class TypedFoo
         $this->id = $id;
     }
 }
+
+class TypedNullableFoo
+{
+    private ?string $value;
+
+    public function setValue($value)
+    {
+        $this->value = $value;
+    }
+
+    public function getValue()
+    {
+        return $this->value;
+    }
+}