Merge branch '5.1'

fabpot · fabpot · commit 7b0d5e3e821f · 2020-08-23T11:22:43.000+02:00
* 5.1:
  account for is_numeric() behavior changes in PHP 8
  fix expected exception messages on PHP 8
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -76,7 +76,7 @@ public function testBadOptions($name, $value)
             $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
         } else {
             $this->expectException('Error');
-            $this->expectExceptionMessage('Undefined class constant \'Memcached::');
+            $this->expectExceptionMessage('Undefined constant Memcached::');
         }
 
         MemcachedAdapter::createConnection([], [$name => $value]);
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -161,7 +161,7 @@ public static function dump($value, int $flags = 0): string
                 return 'false';
             case ctype_digit($value):
                 return \is_string($value) ? "'$value'" : (int) $value;
-            case is_numeric($value):
+            case is_numeric($value) && false === strpos($value, "\n"):
                 $locale = setlocale(LC_NUMERIC, 0);
                 if (false !== $locale) {
                     setlocale(LC_NUMERIC, 'C');

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function testBadOptions($name, $value)`
`76`	`76`	`$this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');`
`77`	`77`	`} else {`
`78`	`78`	`$this->expectException('Error');`
`79`		`- $this->expectExceptionMessage('Undefined class constant \'Memcached::');`
	`79`	`+ $this->expectExceptionMessage('Undefined constant Memcached::');`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`MemcachedAdapter::createConnection([], [$name => $value]);`