Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit b2eeaea00cda · 2019-06-19T17:26:44.000+02:00
* 3.4:
  [FrameworkBundle] minor: fix typo in SessionTest
  [Debug] workaround BC break in PHP 7.3
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php
@@ -71,7 +71,7 @@ public function testFlash($config, $insulate)
 
     /**
      * See if two separate insulated clients can run without
-     * polluting eachother's session data.
+     * polluting each other's session data.
      *
      * @dataProvider getConfigs
      */
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -380,6 +380,11 @@ private function reRegister($prev)
      */
     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);

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function testFlash($config, $insulate)`
`71`	`71`
`72`	`72`	`/**`
`73`	`73`	`* See if two separate insulated clients can run without`
`74`		`- * polluting eachother's session data.`
	`74`	`+ * polluting each other's session data.`
`75`	`75`	`*`
`76`	`76`	`* @dataProvider getConfigs`
`77`	`77`	`*/`