Replace @dataProvider annotations with #[DataProvider] attributes

extra/html-extra/Tests/HtmlAttrMergeTest.php

@@ -11,6 +11,7 @@
 
 namespace Twig\Extra\Html\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Twig\Error\RuntimeError;
 use Twig\Extra\Html\HtmlAttr\MergeableInterface;
@@ -18,9 +19,7 @@ use Twig\Extra\Html\HtmlExtension;
 
 class HtmlAttrMergeTest extends TestCase
 {
-    /**
-     * @dataProvider htmlAttrProvider
-     */
+    #[DataProvider('htmlAttrProvider')]
     public function testMerge(array $expected, array $inputs)
     {
         $result = HtmlExtension::htmlAttrMerge(...$inputs);

extra/html-extra/Tests/HtmlAttrTest.php

@@ -11,6 +11,7 @@
 
 namespace Twig\Extra\Html\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Twig\Environment;
 use Twig\Error\RuntimeError;
@@ -21,9 +22,7 @@ use Twig\Loader\ArrayLoader;
 
 class HtmlAttrTest extends TestCase
 {
-    /**
-     * @dataProvider htmlAttrProvider
-     */
+    #[DataProvider('htmlAttrProvider')]
     public function testPrintingAttributes(string $expected, array $inputs)
     {
         $result = HtmlExtension::htmlAttr(new Environment(new ArrayLoader()), ...$inputs);

src/Test/IntegrationTestCase.php

@@ -108,8 +108,6 @@ abstract class IntegrationTestCase extends TestCase
     }
 
     /**
-     * @dataProvider getTests
-     *
      * @return void
      */
     #[DataProvider('getTests')]
@@ -119,8 +117,6 @@ abstract class IntegrationTestCase extends TestCase
     }
 
     /**
-     * @dataProvider getLegacyTests
-     *
      * @group legacy
      *
      * @return void

src/Test/NodeTestCase.php

@@ -36,8 +36,6 @@ abstract class NodeTestCase extends TestCase
     abstract public static function provideTests(): iterable;
 
     /**
-     * @dataProvider provideTests
-     *
      * @return void
      */
     #[DataProvider('provideTests')]

tests/ExpressionParserTest.php

@@ -356,9 +356,7 @@ class ExpressionParserTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider getTestForInvalidNullSafeOperatorShortCircuiting
-     */
+    #[DataProvider('getTestForInvalidNullSafeOperatorShortCircuiting')]
     public function testInvalidNullSafeOperatorShortCircuiting(string $template, array $data, string $expectedMessage)
     {
         $env = new Environment(new ArrayLoader(['template' => $template]), ['strict_variables' => true]);

tests/Extension/AttributeExtensionTest.php

@@ -11,6 +11,7 @@
 
 namespace Twig\Tests\Extension;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Twig\DeprecatedCallableInfo;
 use Twig\Error\RuntimeError;
@@ -25,9 +26,7 @@ use Twig\TwigTest;
 
 class AttributeExtensionTest extends TestCase
 {
-    /**
-     * @dataProvider provideFilters
-     */
+    #[DataProvider('provideFilters')]
     public function testFilter(string $name, string $method, array $options)
     {
         $extension = new AttributeExtension(ExtensionWithAttributes::class);
@@ -54,9 +53,7 @@ class AttributeExtensionTest extends TestCase
         yield 'pattern' => ['pattern_*_filter', 'patternFilter', []];
     }
 
-    /**
-     * @dataProvider provideFunctions
-     */
+    #[DataProvider('provideFunctions')]
     public function testFunction(string $name, string $method, array $options)
     {
         $extension = new AttributeExtension(ExtensionWithAttributes::class);
@@ -83,9 +80,7 @@ class AttributeExtensionTest extends TestCase
         yield 'deprecated' => ['deprecated_function', 'deprecatedFunction', ['deprecation_info' => new DeprecatedCallableInfo('foo/bar', '1.2')]];
     }
 
-    /**
-     * @dataProvider provideTests
-     */
+    #[DataProvider('provideTests')]
     public function testTest(string $name, string $method, array $options)
     {
         $extension = new AttributeExtension(ExtensionWithAttributes::class);

tests/TemplateTest.php

@@ -145,9 +145,7 @@ class TemplateTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider getNullCoalesceWithImportedMacroData
-     */
+    #[DataProvider('getNullCoalesceWithImportedMacroData')]
     public function testNullCoalesceWithImportedMacro(array $templates, string $expected)
     {
         $twig = new Environment(new ArrayLoader($templates));