Merge branch '7.4' into 8.0

* 7.4:
  replace PHPUnit annotations with attributes

Author: nicolas-grekas

Tests/JsonStreamWriterTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\JsonStreamer\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\JsonStreamer\Exception\NotEncodableValueException;
 use Symfony\Component\JsonStreamer\JsonStreamWriter;
@@ -272,9 +273,7 @@ public function testWriteObjectWithDollarNamedProperties()
         $this->assertWritten('{"$foo":true,"{$foo->bar}":true}', new DummyWithDollarNamedProperties(), Type::object(DummyWithDollarNamedProperties::class));
     }
 
-    /**
-     * @dataProvider throwWhenMaxDepthIsReachedDataProvider
-     */
+    #[DataProvider('throwWhenMaxDepthIsReachedDataProvider')]
     public function testThrowWhenMaxDepthIsReached(Type $type, mixed $data)
     {
         $writer = JsonStreamWriter::create(streamWritersDir: $this->streamWritersDir);

Tests/Read/LexerTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\JsonStreamer\Tests\Read;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\JsonStreamer\Exception\InvalidStreamException;
 use Symfony\Component\JsonStreamer\Read\Lexer;
@@ -44,9 +45,8 @@ public function testTokenizeOverflowingBuffer()
 
     /**
      * Ensures that the lexer is compliant with RFC 8259.
-     *
-     * @dataProvider jsonDataProvider
      */
+    #[DataProvider('jsonDataProvider')]
     public function testValidJson(string $name, string $json, bool $valid)
     {
         $resource = fopen('php://temp', 'w');

Tests/Read/SplitterTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\JsonStreamer\Tests\Read;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\JsonStreamer\Exception\InvalidStreamException;
 use Symfony\Component\JsonStreamer\Read\Splitter;
@@ -39,9 +40,7 @@ public function testSplitDict()
         $this->assertDictBoundaries(['k' => [5, 4]], '{"k":[10]}');
     }
 
-    /**
-     * @dataProvider splitDictInvalidDataProvider
-     */
+    #[DataProvider('splitDictInvalidDataProvider')]
     public function testSplitDictInvalidThrowException(string $expectedMessage, string $content)
     {
         $this->expectException(InvalidStreamException::class);
@@ -74,9 +73,7 @@ public static function splitDictInvalidDataProvider(): iterable
         yield ['Expected end, but got ""x"".', '{"a": true} "x"'];
     }
 
-    /**
-     * @dataProvider splitListInvalidDataProvider
-     */
+    #[DataProvider('splitListInvalidDataProvider')]
     public function testSplitListInvalidThrowException(string $expectedMessage, string $content)
     {
         $this->expectException(InvalidStreamException::class);

Tests/Read/StreamReaderGeneratorTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\JsonStreamer\Tests\Read;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\JsonStreamer\Exception\UnsupportedException;
 use Symfony\Component\JsonStreamer\Mapping\GenericTypePropertyMetadataLoader;
@@ -51,9 +52,7 @@ protected function setUp(): void
         }
     }
 
-    /**
-     * @dataProvider generatedStreamReaderDataProvider
-     */
+    #[DataProvider('generatedStreamReaderDataProvider')]
     public function testGeneratedStreamReader(string $fixture, Type $type)
     {
         $propertyMetadataLoader = new GenericTypePropertyMetadataLoader(

Tests/Write/StreamWriterGeneratorTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\JsonStreamer\Tests\Write;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\JsonStreamer\Exception\UnsupportedException;
 use Symfony\Component\JsonStreamer\Mapping\GenericTypePropertyMetadataLoader;
@@ -54,9 +55,7 @@ protected function setUp(): void
         }
     }
 
-    /**
-     * @dataProvider generatedStreamWriterDataProvider
-     */
+    #[DataProvider('generatedStreamWriterDataProvider')]
     public function testGeneratedStreamWriter(string $fixture, Type $type)
     {
         $propertyMetadataLoader = new GenericTypePropertyMetadataLoader(