Merge branch '2.8' into 3.4

* 2.8:
  fix data mapper return type in docblock
  fix type error handling when writing values

Author: nicolas-grekas

src/Symfony/Component/Form/FormConfigInterface.php

@@ -99,7 +99,7 @@ public function getModelTransformers();
     /**
      * Returns the data mapper of the form.
      *
-     * @return DataMapperInterface The data mapper
+     * @return DataMapperInterface|null The data mapper
      */
     public function getDataMapper();
 

src/Symfony/Component/PropertyAccess/PropertyAccessor.php

@@ -256,7 +256,12 @@ public static function handleError($type, $message, $file, $line, $context = arr
 
     private static function throwInvalidArgumentException($message, $trace, $i)
     {
-        if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file'] && isset($trace[$i]['args'][0])) {
+        // the type mismatch is not caused by invalid arguments (but e.g. by an incompatible return type hint of the writer method)
+        if (0 !== strpos($message, 'Argument ')) {
+            return;
+        }
+
+        if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file'] && array_key_exists(0, $trace[$i]['args'])) {
             $pos = strpos($message, $delim = 'must be of the type ') ?: (strpos($message, $delim = 'must be an instance of ') ?: strpos($message, $delim = 'must implement interface '));
             $pos += \strlen($delim);
             $type = $trace[$i]['args'][0];

src/Symfony/Component/PropertyAccess/Tests/Fixtures/ReturnTyped.php

@@ -28,4 +28,9 @@ public function addFoo(\DateTime $dateTime)
     public function removeFoo(\DateTime $dateTime)
     {
     }
+
+    public function setName($name): self
+    {
+        return 'This does not respect the return type on purpose.';
+    }
 }

src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php

@@ -540,6 +540,17 @@ public function testThrowTypeError()
         $this->propertyAccessor->setValue($object, 'date', 'This is a string, \DateTime expected.');
     }
 
+    /**
+     * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Expected argument of type "DateTime", "NULL" given
+     */
+    public function testThrowTypeErrorWithNullArgument()
+    {
+        $object = new TypeHinted();
+
+        $this->propertyAccessor->setValue($object, 'date', null);
+    }
+
     public function testSetTypeHint()
     {
         $date = new \DateTime();
@@ -663,4 +674,16 @@ public function testDoNotDiscardReturnTypeError()
 
         $this->propertyAccessor->setValue($object, 'foos', array(new \DateTime()));
     }
+
+    /**
+     * @requires PHP 7
+     *
+     * @expectedException \TypeError
+     */
+    public function testDoNotDiscardReturnTypeErrorWhenWriterMethodIsMisconfigured()
+    {
+        $object = new ReturnTyped();
+
+        $this->propertyAccessor->setValue($object, 'name', 'foo');
+    }
 }