From c352a8d283bdf39e1b6bcc31e1a9be0bcfc82cb1 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Mon, 25 Nov 2024 11:50:28 +0100
Subject: [PATCH] [Twig 4] Add PHPUnit as dev dependency

---
 .github/workflows/ci.yml                      |  3 +--
 composer.json                                 |  4 ++--
 phpunit.xml.dist                              |  2 +-
 tests/DeprecatedCallableInfoTest.php          |  5 ++---
 tests/LexerTest.php                           | 12 +++---------
 tests/Util/CallableArgumentsExtractorTest.php |  5 ++---
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3622b420bbc..827b790a36b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,6 @@ jobs:
                   coverage: "none"
                   php-version: ${{ matrix.php-version }}
                   ini-values: memory_limit=-1
-                  tools: phpunit:11.3
 
             - name: "Add PHPUnit matcher"
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -41,7 +40,7 @@ jobs:
             - run: composer install
 
             - name: "Run tests"
-              run: phpunit
+              run: vendor/bin/phpunit
 
     extension-tests:
         needs:
diff --git a/composer.json b/composer.json
index 1ef2042f86b..487900eaf2a 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,6 @@
     "keywords": ["templating"],
     "homepage": "https://twig.symfony.com",
     "license": "BSD-3-Clause",
-    "minimum-stability": "dev",
     "authors": [
         {
             "name": "Fabien Potencier",
@@ -32,7 +31,8 @@
     },
     "require-dev": {
         "psr/container": "^1.0|^2.0",
-        "phpstan/phpstan": "^2.0"
+        "phpstan/phpstan": "^2.0",
+        "phpunit/phpunit": "^11.4"
     },
     "autoload": {
         "psr-4" : {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 99dca229e57..c5b89c08071 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,7 +5,7 @@
          processIsolation="false"
          stopOnFailure="false"
          bootstrap="vendor/autoload.php"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          cacheDirectory=".phpunit.cache"
          backupStaticProperties="false"
          failOnDeprecation="true"
diff --git a/tests/DeprecatedCallableInfoTest.php b/tests/DeprecatedCallableInfoTest.php
index 4e6d1583ce5..b2e48311882 100644
--- a/tests/DeprecatedCallableInfoTest.php
+++ b/tests/DeprecatedCallableInfoTest.php
@@ -11,14 +11,13 @@
  * file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Twig\DeprecatedCallableInfo;
 
 class DeprecatedCallableInfoTest extends TestCase
 {
-    /**
-     * @dataProvider provideTestsForTriggerDeprecation
-     */
+    #[DataProvider('provideTestsForTriggerDeprecation')]
     public function testTriggerDeprecation($expected, DeprecatedCallableInfo $info)
     {
         $info->setType('function');
diff --git a/tests/LexerTest.php b/tests/LexerTest.php
index d2d586ba273..1501fe24715 100644
--- a/tests/LexerTest.php
+++ b/tests/LexerTest.php
@@ -491,9 +491,7 @@ public function testInlineCommentWithHashInString()
         $this->assertTrue($stream->isEOF());
     }
 
-    /**
-     * @dataProvider getTemplateForInlineCommentsForVariable
-     */
+    #[DataProvider('getTemplateForInlineCommentsForVariable')]
     public function testInlineCommentForVariable(string $template)
     {
         $lexer = new Lexer(new Environment(new ArrayLoader()));
@@ -524,9 +522,7 @@ public static function getTemplateForInlineCommentsForVariable()
         }}'];
     }
 
-    /**
-     * @dataProvider getTemplateForInlineCommentsForBlock
-     */
+    #[DataProvider('getTemplateForInlineCommentsForBlock')]
     public function testInlineCommentForBlock(string $template)
     {
         $lexer = new Lexer(new Environment(new ArrayLoader()));
@@ -562,9 +558,7 @@ public static function getTemplateForInlineCommentsForBlock()
         %}me{% endif %}'];
     }
 
-    /**
-     * @dataProvider getTemplateForInlineCommentsForComment
-     */
+    #[DataProvider('getTemplateForInlineCommentsForComment')]
     public function testInlineCommentForComment(string $template)
     {
         $lexer = new Lexer(new Environment(new ArrayLoader()));
diff --git a/tests/Util/CallableArgumentsExtractorTest.php b/tests/Util/CallableArgumentsExtractorTest.php
index eee4aa8ceb5..791123765cf 100644
--- a/tests/Util/CallableArgumentsExtractorTest.php
+++ b/tests/Util/CallableArgumentsExtractorTest.php
@@ -11,6 +11,7 @@
  * file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Twig\Error\SyntaxError;
 use Twig\Node\EmptyNode;
@@ -83,9 +84,7 @@ public function testGetArgumentsForStaticMethod()
         $this->assertEquals(['arg1'], $this->getArguments('custom_static_function', __CLASS__.'::customStaticFunction', ['arg1' => 'arg1']));
     }
 
-    /**
-     * @dataProvider getGetArgumentsConversionData
-     */
+    #[DataProvider('getGetArgumentsConversionData')]
     public function testGetArgumentsConversion($arg1, $arg2)
     {
         $this->assertEquals([null], $this->getArguments('custom', eval("return fn (\$$arg1) => '';"), [$arg1 => null]));