Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit febff9b1fd44 · 2019-12-01T11:50:45.000+01:00
* 4.3:
  Fix failures on PHP 7.4
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -305,7 +305,7 @@ private function generateItems(array $keys): \Generator
     public static function throwOnRequiredClass($class)
     {
         $e = new \ReflectionException("Class $class does not exist");
-        $trace = $e->getTrace();
+        $trace = debug_backtrace();
         $autoloadFrame = [
             'function' => 'spl_autoload_call',
             'args' => [$class],
diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -72,7 +72,7 @@ public function isFresh($timestamp)
                 spl_autoload_register(__CLASS__.'::throwOnRequiredClass');
             }
             $autoloadedClass = self::$autoloadedClass;
-            self::$autoloadedClass = $this->resource;
+            self::$autoloadedClass = ltrim($this->resource, '\\');
 
             try {
                 $exists = class_exists($this->resource) || interface_exists($this->resource, false) || trait_exists($this->resource, false);
@@ -153,7 +153,7 @@ public static function throwOnRequiredClass($class, \Exception $previous = null)
             throw $e;
         }
 
-        $trace = $e->getTrace();
+        $trace = debug_backtrace();
         $autoloadFrame = [
             'function' => 'spl_autoload_call',
             'args' => [$class],
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -188,13 +188,14 @@ private static function throwInvalidArgumentException(string $message, array $tr
             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));
         }
     }
 
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -546,7 +546,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);

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ private function generateItems(array $keys): \Generator`
`305`	`305`	`public static function throwOnRequiredClass($class)`
`306`	`306`	`{`
`307`	`307`	`$e = new \ReflectionException("Class $class does not exist");`
`308`		`- $trace = $e->getTrace();`
	`308`	`+ $trace = debug_backtrace();`
`309`	`309`	`$autoloadFrame = [`
`310`	`310`	`'function' => 'spl_autoload_call',`
`311`	`311`	`'args' => [$class],`
Original file line number	Diff line number	Diff line change
`@@ -188,13 +188,14 @@ private static function throwInvalidArgumentException(string $message, array $tr`
`188`	`188`	`return;`
`189`	`189`	`}`
`190`	`190`
`191`		`- if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file'] && \array_key_exists(0, $trace[$i]['args'])) {`
	`191`	`+ if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file']) {`
`192`	`192`	`$pos = strpos($message, $delim = 'must be of the type ') ?: (strpos($message, $delim = 'must be an instance of ') ?: strpos($message, $delim = 'must implement interface '));`
`193`	`193`	`$pos += \strlen($delim);`
`194`		`- $type = $trace[$i]['args'][0];`
`195`		`- $type = \is_object($type) ? \get_class($type) : \gettype($type);`
	`194`	`+ $j = strpos($message, ',', $pos);`
	`195`	`+ $type = substr($message, 2 + $j, strpos($message, ' given', $j) - $j - 2);`
	`196`	`+ $message = substr($message, C37D $pos, $j - $pos);`
`196`	`197`
`197`		`- throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type, $propertyPath));`
	`198`	`+ throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $message, 'NULL' === $type ? 'null' : $type, $propertyPath));`
`198`	`199`	`}`
`199`	`200`	`}`
`200`	`201`
Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ public function testThrowTypeError()`
`546`	`546`	`public function testThrowTypeErrorWithNullArgument()`
`547`	`547`	`{`
`548`	`548`	`$this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');`
`549`		`- $this->expectExceptionMessage('Expected argument of type "DateTime", "NULL" given');`
	`549`	`+ $this->expectExceptionMessage('Expected argument of type "DateTime", "null" given');`
`550`	`550`	`$object = new TypeHinted();`
`551`	`551`
`552`	`552`	`$this->propertyAccessor->setValue($object, 'date', null);`