Merge branch '3.4' into 4.2
* 3.4: [FrameworkBundle] minor: fix typo in SessionTest [Debug] workaround BC break in PHP 7.3
This commit is contained in:
commit
b2eeaea00c
@ -71,7 +71,7 @@ class SessionTest extends WebTestCase
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* See if two separate insulated clients can run without
|
* See if two separate insulated clients can run without
|
||||||
* polluting eachother's session data.
|
* polluting each other's session data.
|
||||||
*
|
*
|
||||||
* @dataProvider getConfigs
|
* @dataProvider getConfigs
|
||||||
*/
|
*/
|
||||||
|
@ -380,6 +380,11 @@ class ErrorHandler
|
|||||||
*/
|
*/
|
||||||
public function handleError($type, $message, $file, $line)
|
public function handleError($type, $message, $file, $line)
|
||||||
{
|
{
|
||||||
|
// @deprecated to be removed in Symfony 5.0
|
||||||
|
if (\PHP_VERSION_ID >= 70300 && $message && '"' === $message[0] && 0 === strpos($message, '"continue') && preg_match('/^"continue(?: \d++)?" targeting switch is equivalent to "break(?: \d++)?"\. Did you mean to use "continue(?: \d++)?"\?$/', $message)) {
|
||||||
|
$type = E_DEPRECATED;
|
||||||
|
}
|
||||||
|
|
||||||
// Level is the current error reporting level to manage silent error.
|
// Level is the current error reporting level to manage silent error.
|
||||||
$level = error_reporting();
|
$level = error_reporting();
|
||||||
$silenced = 0 === ($level & $type);
|
$silenced = 0 === ($level & $type);
|
||||||
|
Reference in New Issue
Block a user