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
This commit is contained in:
commit
77418e712e
@ -76,7 +76,7 @@ class MemcachedAdapterTest extends AdapterTestCase
|
|||||||
$this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
|
$this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
|
||||||
} else {
|
} else {
|
||||||
$this->expectException('Error');
|
$this->expectException('Error');
|
||||||
$this->expectExceptionMessage('Undefined class constant \'Memcached::');
|
$this->expectExceptionMessage('Undefined constant Memcached::');
|
||||||
}
|
}
|
||||||
|
|
||||||
MemcachedAdapter::createConnection([], [$name => $value]);
|
MemcachedAdapter::createConnection([], [$name => $value]);
|
||||||
|
@ -86,7 +86,7 @@ class MemcachedCacheTest extends CacheTestCase
|
|||||||
$this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
|
$this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
|
||||||
} else {
|
} else {
|
||||||
$this->expectException('Error');
|
$this->expectException('Error');
|
||||||
$this->expectExceptionMessage('Undefined class constant \'Memcached::');
|
$this->expectExceptionMessage('Undefined constant Memcached::');
|
||||||
}
|
}
|
||||||
|
|
||||||
MemcachedCache::createConnection([], [$name => $value]);
|
MemcachedCache::createConnection([], [$name => $value]);
|
||||||
|
@ -161,7 +161,7 @@ class Inline
|
|||||||
return 'false';
|
return 'false';
|
||||||
case ctype_digit($value):
|
case ctype_digit($value):
|
||||||
return \is_string($value) ? "'$value'" : (int) $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);
|
$locale = setlocale(LC_NUMERIC, 0);
|
||||||
if (false !== $locale) {
|
if (false !== $locale) {
|
||||||
setlocale(LC_NUMERIC, 'C');
|
setlocale(LC_NUMERIC, 'C');
|
||||||
|
Reference in New Issue
Block a user