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:
Nicolas Grekas 2019-06-19 17:26:44 +02:00
commit b2eeaea00c
2 changed files with 6 additions and 1 deletions

View File

@ -71,7 +71,7 @@ class SessionTest extends WebTestCase
/**
* See if two separate insulated clients can run without
* polluting eachother's session data.
* polluting each other's session data.
*
* @dataProvider getConfigs
*/

View File

@ -380,6 +380,11 @@ class ErrorHandler
*/
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 = error_reporting();
$silenced = 0 === ($level & $type);