Merge branch '3.4' into 4.3

* 3.4:
  Fix failures on PHP 7.4

Author: nicolas-grekas

PropertyAccessor.php

@@ -188,13 +188,14 @@ private static function throwInvalidArgumentException($message, $trace, $i, $pro
             return;
         }
 
-        if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file'] && \array_key_exists(0, $trace[$i]['args'])) {
+        if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file']) {
             $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];
-            $type = \is_object($type) ? \get_class($type) : \gettype($type);
+            $j = strpos($message, ',', $pos);
+            $type = substr($message, 2 + $j, strpos($message, ' given', $j) - $j - 2);
+            $message = substr($message, $pos, $j - $pos);
 
-            throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type, $propertyPath));
+            throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $message, 'NULL' === $type ? 'null' : $type, $propertyPath));
         }
     }
 

Tests/PropertyAccessorTest.php

@@ -544,7 +544,7 @@ public function testThrowTypeError()
     public function testThrowTypeErrorWithNullArgument()
     {
         $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Expected argument of type "DateTime", "NULL" given');
+        $this->expectExceptionMessage('Expected argument of type "DateTime", "null" given');
         $object = new TypeHinted();
 
         $this->propertyAccessor->setValue($object, 'date', null);