Skip to content

Commit 77418e7

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: account for is_numeric() behavior changes in PHP 8 fix expected exception messages on PHP 8
2 parents 4da3ece + 4b3d5b6 commit 77418e7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function testBadOptions($name, $value)
7676
$this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
7777
} else {
7878
$this->expectException('Error');
79-
$this->expectExceptionMessage('Undefined class constant \'Memcached::');
79+
$this->expectExceptionMessage('Undefined constant Memcached::');
8080
}
8181

8282
MemcachedAdapter::createConnection([], [$name => $value]);

src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function testBadOptions(string $name, $value)
8686
$this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
8787
} else {
8888
$this->expectException('Error');
89-
$this->expectExceptionMessage('Undefined class constant \'Memcached::');
89+
$this->expectExceptionMessage('Undefined constant Memcached::');
9090
}
9191

9292
MemcachedCache::createConnection([], [$name => $value]);

src/Symfony/Component/Yaml/Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public static function dump($value, int $flags = 0): string
161161
return 'false';
162162
case ctype_digit($value):
163163
return \is_string($value) ? "'$value'" : (int) $value;
164-
case is_numeric($value):
164+
case is_numeric($value) && false === strpos($value, "\n"):
165165
$locale = setlocale(LC_NUMERIC, 0);
166166
if (false !== $locale) {
167167
setlocale(LC_NUMERIC, 'C');

0 commit comments

Comments
 (0)