Merge branch '6.0' into 6.1

* 6.0:
  Stick to PHPUnit 8.5.26
  [Yaml] Enhance coverage in yaml DumperTest.
  [PhpUnitBridge] fix tests
  [Messenger] CS fix

Author: nicolas-grekas

phpunit

@@ -13,7 +13,7 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
     if (\PHP_VERSION_ID < 70200) {
         putenv('SYMFONY_PHPUNIT_VERSION=7.5');
     } elseif (\PHP_VERSION_ID < 70300) {
-        putenv('SYMFONY_PHPUNIT_VERSION=8.5');
+        putenv('SYMFONY_PHPUNIT_VERSION=8.5.26');
     } else {
         putenv('SYMFONY_PHPUNIT_VERSION=9.5');
     }

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline.phpt

@@ -78,3 +78,4 @@ print "Cannot test baselineFile contents because it is generated in a shutdown f
 ?>
 --EXPECT--
 Cannot test baselineFile contents because it is generated in a shutdown function registered by another shutdown function.
+Legacy deprecation notices (1)

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline2.phpt

@@ -66,6 +66,8 @@ $foo->testLegacyFoo();
 $foo->testNonLegacyBar();
 ?>
 --EXPECTF--
+Legacy deprecation notices (1)
+
 Other deprecation notices (2)
 
   1x: root deprecation

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/baseline3.phpt

@@ -69,7 +69,7 @@ $foo->testLegacyFoo();
 $foo->testNonLegacyBar();
 ?>
 --EXPECTF--
-Legacy deprecation notices (1)
+Legacy deprecation notices (2)
 
 Other deprecation notices (2)
 

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_baseline.phpt

@@ -62,3 +62,4 @@ print "Cannot test baselineFile contents because it is generated in a shutdown f
 ?>
 --EXPECT--
 Cannot test baselineFile contents because it is generated in a shutdown function registered by another shutdown function.
+Legacy deprecation notices (1)

src/Symfony/Component/Messenger/EventListener/ResetServicesListener.php

@@ -15,7 +15,6 @@
 use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
 use Symfony\Component\Messenger\Event\WorkerRunningEvent;
 use Symfony\Component\Messenger\Event\WorkerStoppedEvent;
-use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @author Grégoire Pineau <[email protected]>

src/Symfony/Component/Messenger/Worker.php

@@ -29,7 +29,6 @@
 use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 use Symfony\Component\Messenger\Transport\Receiver\QueueReceiverInterface;
 use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
-use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @author Samuel Roze <[email protected]>

src/Symfony/Component/Yaml/Tests/DumperTest.php

@@ -28,7 +28,7 @@ class DumperTest extends TestCase
         '' => 'bar',
         'foo' => '#bar',
         'foo\'bar' => [],
-        'bar' => [1, 'foo'],
+        'bar' => [1, 'foo', ['a' => 'A']],
         'foobar' => [
             'foo' => 'bar',
             'bar' => [1, 'foo'],
@@ -64,6 +64,8 @@ public function testIndentationInConstructor()
 bar:
        - 1
        - foo
+       -
+              a: A
 foobar:
        foo: bar
        bar:
@@ -107,7 +109,7 @@ public function testSpecifications()
     public function testInlineLevel()
     {
         $expected = <<<'EOF'
-{ '': bar, foo: '#bar', "foo'bar": {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
+{ '': bar, foo: '#bar', "foo'bar": {  }, bar: [1, foo, { a: A }], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
 EOF;
         $this->assertEquals($expected, $this->dumper->dump($this->array, -10), '->dump() takes an inline level argument');
         $this->assertEquals($expected, $this->dumper->dump($this->array, 0), '->dump() takes an inline level argument');
@@ -116,7 +118,7 @@ public function testInlineLevel()
 '': bar
 foo: '#bar'
 "foo'bar": {  }
-bar: [1, foo]
+bar: [1, foo, { a: A }]
 foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } }
 
 EOF;
@@ -129,6 +131,7 @@ public function testInlineLevel()
 bar:
     - 1
     - foo
+    - { a: A }
 foobar:
     foo: bar
     bar: [1, foo]
@@ -144,6 +147,8 @@ public function testInlineLevel()
 bar:
     - 1
     - foo
+    -
+        a: A
 foobar:
     foo: bar
     bar:
@@ -163,6 +168,8 @@ public function testInlineLevel()
 bar:
     - 1
     - foo
+    -
+        a: A
 foobar:
     foo: bar
     bar:
@@ -379,8 +386,9 @@ public function testDumpingTaggedValueSequenceRespectsInlineLevel()
             new TaggedValue('user', [
                 'username' => 'jane',
             ]),
-            new TaggedValue('user', [
-                'username' => 'john',
+            new TaggedValue('names', [
+                'john',
+                'claire',
             ]),
         ];
 
@@ -389,8 +397,9 @@ public function testDumpingTaggedValueSequenceRespectsInlineLevel()
         $expected = <<<YAML
 - !user
   username: jane
-- !user
-  username: john
+- !names
+  - john
+  - claire
 
 YAML;
         $this->assertSame($expected, $yaml);
@@ -402,16 +411,17 @@ public function testDumpingTaggedValueSequenceWithInlinedTagValues()
             new TaggedValue('user', [
                 'username' => 'jane',
             ]),
-            new TaggedValue('user', [
-                'username' => 'john',
+            new TaggedValue('names', [
+                'john',
+                'claire',
             ]),
         ];
 
         $yaml = $this->dumper->dump($data, 1);
 
         $expected = <<<YAML
 - !user { username: jane }
-- !user { username: john }
+- !names [john, claire]
 
 YAML;
         $this->assertSame($expected, $yaml);
@@ -423,8 +433,9 @@ public function testDumpingTaggedValueMapRespectsInlineLevel()
             'user1' => new TaggedValue('user', [
                 'username' => 'jane',
             ]),
-            'user2' => new TaggedValue('user', [
-                'username' => 'john',
+            'names1' => new TaggedValue('names', [
+                'john',
+                'claire',
             ]),
         ];
 
@@ -433,8 +444,9 @@ public function testDumpingTaggedValueMapRespectsInlineLevel()
         $expected = <<<YAML
 user1: !user
     username: jane
-user2: !user
-    username: john
+names1: !names
+    - john
+    - claire
 
 YAML;
         $this->assertSame($expected, $yaml);
@@ -446,16 +458,17 @@ public function testDumpingTaggedValueMapWithInlinedTagValues()
             'user1' => new TaggedValue('user', [
                 'username' => 'jane',
             ]),
-            'user2' => new TaggedValue('user', [
-                'username' => 'john',
+            'names1' => new TaggedValue('names', [
+                'john',
+                'claire',
             ]),
         ];
 
         $yaml = $this->dumper->dump($data, 1);
 
         $expected = <<<YAML
 user1: !user { username: jane }
-user2: !user { username: john }
+names1: !names [john, claire]
 
 YAML;
         $this->assertSame($expected, $yaml);