Merge branch '4.4' into 5.1
* 4.4: account for is_numeric() behavior changes in PHP 8 fix expected exception messages on PHP 8
This commit is contained in:
commit
d24a181e55
@ -76,7 +76,7 @@ class MemcachedAdapterTest extends AdapterTestCase
|
||||
$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]);
|
||||
|
@ -161,7 +161,7 @@ class Inline
|
||||
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');
|
||||
|
Reference in New Issue
Block a user