Merge branch '6.0' into 6.1

* 6.0:
  Exclude from baseline generation deprecations triggered in legacy test
  [HttpFoundation] Update "[Session] Overwrite invalid session id" to only validate when files session storage is used
  [DoctrineBridge] Add missing break
  [PropertyInfo] CS fix
  [Serializer] Try all possible denormalization route with union types when ALLOW_EXTRA_ATTRIBUTES=false
  CS fix
  [Cache] Respect $save option in ChainAdapter
  [ExpressionLanguage] fix tests (bis)
  [ExpressionLanguage] fix tests
  Allow passing null in twig_is_selected_choice
  [Cache] Respect $save option in ArrayAdapter
  [HttpKernel] Disable session tracking while collecting profiler data
  [MonologBridge] Fixed support of elasticsearch 7.+ in ElasticsearchLogstashHandler
  [DoctrineBridge] Extend type guessing on enum fields
  [FrameworkBundle] Lower JsonSerializableNormalizer priority
  [Messenger] move resetting services at worker stopped into ResetServicesListener
  [Mailer] Fix Error Handling for OhMySMTP Bridge
  Fix for missing sender name in case with usage of the EnvelopeListener

Author: nicolas-grekas

Tests/Node/BinaryNodeTest.php

@@ -180,23 +180,26 @@ public function testEvaluateMatchesWithInvalidRegexp()
     {
         $node = new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('this is not a regexp'));
 
-        $this->expectExceptionObject(new SyntaxError('Regexp "this is not a regexp" passed to "matches" is not valid: Delimiter must not be alphanumeric or backslash'));
+        $this->expectException(SyntaxError::class);
+        $this->expectExceptionMessage('Regexp "this is not a regexp" passed to "matches" is not valid: Delimiter must not be alphanumeric');
         $node->evaluate([], []);
     }
 
     public function testEvaluateMatchesWithInvalidRegexpAsExpression()
     {
         $node = new BinaryNode('matches', new ConstantNode('abc'), new NameNode('regexp'));
 
-        $this->expectExceptionObject(new SyntaxError('Regexp "this is not a regexp" passed to "matches" is not valid: Delimiter must not be alphanumeric or backslash'));
+        $this->expectException(SyntaxError::class);
+        $this->expectExceptionMessage('Regexp "this is not a regexp" passed to "matches" is not valid: Delimiter must not be alphanumeric');
         $node->evaluate([], ['regexp' => 'this is not a regexp']);
     }
 
     public function testCompileMatchesWithInvalidRegexp()
     {
         $node = new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('this is not a regexp'));
 
-        $this->expectExceptionObject(new SyntaxError('Regexp "this is not a regexp" passed to "matches" is not valid: Delimiter must not be alphanumeric or backslash'));
+        $this->expectException(SyntaxError::class);
+        $this->expectExceptionMessage('Regexp "this is not a regexp" passed to "matches" is not valid: Delimiter must not be alphanumeric');
         $compiler = new Compiler([]);
         $node->compile($compiler);
     }
@@ -205,7 +208,8 @@ public function testCompileMatchesWithInvalidRegexpAsExpression()
     {
         $node = new BinaryNode('matches', new ConstantNode('abc'), new NameNode('regexp'));
 
-        $this->expectExceptionObject(new SyntaxError('Regexp "this is not a regexp" passed to "matches" is not valid: Delimiter must not be alphanumeric or backslash'));
+        $this->expectException(SyntaxError::class);
+        $this->expectExceptionMessage('Regexp "this is not a regexp" passed to "matches" is not valid: Delimiter must not be alphanumeric');
         $compiler = new Compiler([]);
         $node->compile($compiler);
         eval('$regexp = "this is not a regexp"; '.$compiler->getSource().';');