diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7826f5785..029d6de18 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,9 +109,6 @@ jobs: runs-on: 'ubuntu-latest' - env: - SYMFONY_PHPUNIT_VERSION: ${{ matrix.php-version == '8.1' && '9.6' || '11.3' }} - strategy: matrix: php-version: @@ -140,6 +137,7 @@ jobs: coverage: "none" php-version: ${{ matrix.php-version }} ini-values: memory_limit=-1 + tools: phpunit:${{ matrix.php-version == '8.1' && '10.5' || '11.3' }} - name: "Add PHPUnit matcher" run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" @@ -158,14 +156,6 @@ jobs: working-directory: extra/${{ matrix.extension }} run: composer install - - name: "Install PHPUnit" - working-directory: extra/${{ matrix.extension }} - run: vendor/bin/simple-phpunit install - - - name: "PHPUnit version" - working-directory: extra/${{ matrix.extension }} - run: vendor/bin/simple-phpunit --version - - name: "Switch use_yield to true" if: "matrix.php-version == '8.2'" run: | @@ -179,7 +169,7 @@ jobs: # "€ 1000000.00" instead of "€1,000,000.00". phpunit.xml.dist's entry is # too late because ICU caches the default locale at the first call. LANG: 'en_US.UTF-8' - run: vendor/bin/simple-phpunit + run: phpunit phpstan: name: "PHPStan" diff --git a/extra/cache-extra/composer.json b/extra/cache-extra/composer.json index 8b21310ee..ce285deb4 100644 --- a/extra/cache-extra/composer.json +++ b/extra/cache-extra/composer.json @@ -19,9 +19,6 @@ "symfony/cache": "^5.4|^6.4|^7.0|^8.0", "twig/twig": "^3.21|^4.0" }, - "require-dev": { - "symfony/phpunit-bridge": "^6.4|^7.0" - }, "autoload": { "psr-4" : { "Twig\\Extra\\Cache\\" : "" }, "exclude-from-classmap": [ diff --git a/extra/cache-extra/phpunit.xml.dist b/extra/cache-extra/phpunit.xml.dist index 0cfdd7296..5e8e58473 100644 --- a/extra/cache-extra/phpunit.xml.dist +++ b/extra/cache-extra/phpunit.xml.dist @@ -1,6 +1,6 @@ - - + + ./ @@ -8,7 +8,7 @@ ./Tests ./vendor - + diff --git a/extra/cssinliner-extra/Tests/LegacyFunctionsTest.php b/extra/cssinliner-extra/Tests/LegacyFunctionsTest.php index 4337f4e4f..10969825a 100644 --- a/extra/cssinliner-extra/Tests/LegacyFunctionsTest.php +++ b/extra/cssinliner-extra/Tests/LegacyFunctionsTest.php @@ -11,14 +11,13 @@ namespace Twig\Extra\CssInliner\Tests; +use PHPUnit\Framework\Attributes\IgnoreDeprecations; use PHPUnit\Framework\TestCase; use Twig\Extra\CssInliner\CssInlinerExtension; use function Twig\Extra\CssInliner\twig_inline_css; -/** - * @group legacy - */ +#[IgnoreDeprecations] class LegacyFunctionsTest extends TestCase { public function testInlineCss(): void diff --git a/extra/cssinliner-extra/composer.json b/extra/cssinliner-extra/composer.json index f8cce58e0..67cacbaf9 100644 --- a/extra/cssinliner-extra/composer.json +++ b/extra/cssinliner-extra/composer.json @@ -20,9 +20,6 @@ "tijsverkoyen/css-to-inline-styles": "^2.0", "twig/twig": "^3.13|^4.0" }, - "require-dev": { - "symfony/phpunit-bridge": "^6.4|^7.0" - }, "autoload": { "files": [ "Resources/functions.php" ], "psr-4" : { "Twig\\Extra\\CssInliner\\" : "" }, diff --git a/extra/cssinliner-extra/phpunit.xml.dist b/extra/cssinliner-extra/phpunit.xml.dist index de3fc99ea..e75324059 100644 --- a/extra/cssinliner-extra/phpunit.xml.dist +++ b/extra/cssinliner-extra/phpunit.xml.dist @@ -1,6 +1,6 @@ - - + + ./ @@ -8,7 +8,7 @@ ./Tests ./vendor - + diff --git a/extra/html-extra/Tests/LegacyFunctionsTest.php b/extra/html-extra/Tests/LegacyFunctionsTest.php index 3f961dad3..742724a07 100644 --- a/extra/html-extra/Tests/LegacyFunctionsTest.php +++ b/extra/html-extra/Tests/LegacyFunctionsTest.php @@ -11,12 +11,11 @@ namespace Twig\Extra\Html\Tests; +use PHPUnit\Framework\Attributes\IgnoreDeprecations; use PHPUnit\Framework\TestCase; use Twig\Extra\Html\HtmlExtension; -/** - * @group legacy - */ +#[IgnoreDeprecations] class LegacyFunctionsTest extends TestCase { public function testHtmlToMarkdown(): void diff --git a/extra/html-extra/composer.json b/extra/html-extra/composer.json index db43e18bb..6cf69150c 100644 --- a/extra/html-extra/composer.json +++ b/extra/html-extra/composer.json @@ -20,9 +20,6 @@ "symfony/mime": "^5.4|^6.4|^7.0|^8.0", "twig/twig": "^3.13|^4.0" }, - "require-dev": { - "symfony/phpunit-bridge": "^6.4|^7.0" - }, "autoload": { "files": [ "Resources/functions.php" ], "psr-4" : { "Twig\\Extra\\Html\\" : "" }, diff --git a/extra/html-extra/phpunit.xml.dist b/extra/html-extra/phpunit.xml.dist index 1b088ff26..86a40d421 100644 --- a/extra/html-extra/phpunit.xml.dist +++ b/extra/html-extra/phpunit.xml.dist @@ -1,6 +1,6 @@ - - + + ./ @@ -8,7 +8,7 @@ ./Tests ./vendor - + diff --git a/extra/inky-extra/Tests/LegacyFunctionsTest.php b/extra/inky-extra/Tests/LegacyFunctionsTest.php index 42d9c2923..fab6b311b 100644 --- a/extra/inky-extra/Tests/LegacyFunctionsTest.php +++ b/extra/inky-extra/Tests/LegacyFunctionsTest.php @@ -11,14 +11,13 @@ namespace Twig\Extra\Inky\Tests; +use PHPUnit\Framework\Attributes\IgnoreDeprecations; use PHPUnit\Framework\TestCase; use Twig\Extra\Inky\InkyExtension; use function Twig\Extra\Inky\twig_inky; -/** - * @group legacy - */ +#[IgnoreDeprecations] class LegacyFunctionsTest extends TestCase { public function testInlineCss(): void diff --git a/extra/inky-extra/composer.json b/extra/inky-extra/composer.json index 3d6ed29b8..2b1ad2c66 100644 --- a/extra/inky-extra/composer.json +++ b/extra/inky-extra/composer.json @@ -20,9 +20,6 @@ "lorenzo/pinky": "^1.0.5", "twig/twig": "^3.13|^4.0" }, - "require-dev": { - "symfony/phpunit-bridge": "^6.4|^7.0" - }, "autoload": { "files": [ "Resources/functions.php" ], "psr-4" : { "Twig\\Extra\\Inky\\" : "" }, diff --git a/extra/inky-extra/phpunit.xml.dist b/extra/inky-extra/phpunit.xml.dist index 7f759dd3d..058c84ca0 100644 --- a/extra/inky-extra/phpunit.xml.dist +++ b/extra/inky-extra/phpunit.xml.dist @@ -1,6 +1,6 @@ - - + + ./ @@ -8,7 +8,7 @@ ./Tests ./vendor - + diff --git a/extra/intl-extra/composer.json b/extra/intl-extra/composer.json index 21e3956b3..919c980bf 100644 --- a/extra/intl-extra/composer.json +++ b/extra/intl-extra/composer.json @@ -19,9 +19,6 @@ "twig/twig": "^3.13|^4.0", "symfony/intl": "^5.4|^6.4|^7.0|^8.0" }, - "require-dev": { - "symfony/phpunit-bridge": "^6.4|^7.0" - }, "autoload": { "psr-4" : { "Twig\\Extra\\Intl\\" : "" }, "exclude-from-classmap": [ diff --git a/extra/intl-extra/phpunit.xml.dist b/extra/intl-extra/phpunit.xml.dist index d33987d16..993ff5c2b 100644 --- a/extra/intl-extra/phpunit.xml.dist +++ b/extra/intl-extra/phpunit.xml.dist @@ -1,6 +1,6 @@ - - + + ./ @@ -8,7 +8,7 @@ ./Tests ./vendor - + diff --git a/extra/markdown-extra/Tests/LegacyFunctionsTest.php b/extra/markdown-extra/Tests/LegacyFunctionsTest.php index 5fb5ed360..f3687f489 100644 --- a/extra/markdown-extra/Tests/LegacyFunctionsTest.php +++ b/extra/markdown-extra/Tests/LegacyFunctionsTest.php @@ -11,15 +11,14 @@ namespace Twig\Extra\Markdown\Tests; +use PHPUnit\Framework\Attributes\IgnoreDeprecations; use PHPUnit\Framework\TestCase; use function Twig\Extra\Markdown\html_to_markdown; use Twig\Extra\Markdown\MarkdownExtension; -/** - * @group legacy - */ +#[IgnoreDeprecations] class LegacyFunctionsTest extends TestCase { public function testHtmlToMarkdown(): void diff --git a/extra/markdown-extra/composer.json b/extra/markdown-extra/composer.json index 1d92d7575..30e548454 100644 --- a/extra/markdown-extra/composer.json +++ b/extra/markdown-extra/composer.json @@ -20,7 +20,6 @@ "twig/twig": "^3.13|^4.0" }, "require-dev": { - "symfony/phpunit-bridge": "^6.4|^7.0", "erusev/parsedown": "dev-master as 1.x-dev", "league/commonmark": "^2.7", "league/html-to-markdown": "^4.8|^5.0", diff --git a/extra/markdown-extra/phpunit.xml.dist b/extra/markdown-extra/phpunit.xml.dist index a40846ed4..3be2637b6 100644 --- a/extra/markdown-extra/phpunit.xml.dist +++ b/extra/markdown-extra/phpunit.xml.dist @@ -1,6 +1,6 @@ - - + + ./ @@ -8,7 +8,7 @@ ./Tests ./vendor - + diff --git a/extra/string-extra/composer.json b/extra/string-extra/composer.json index 27a0f346a..2affd7cdc 100644 --- a/extra/string-extra/composer.json +++ b/extra/string-extra/composer.json @@ -20,9 +20,6 @@ "symfony/translation-contracts": "^1.1|^2|^3", "twig/twig": "^3.13|^4.0" }, - "require-dev": { - "symfony/phpunit-bridge": "^6.4|^7.0" - }, "autoload": { "psr-4" : { "Twig\\Extra\\String\\" : "" }, "exclude-from-classmap": [ diff --git a/extra/string-extra/phpunit.xml.dist b/extra/string-extra/phpunit.xml.dist index aa15cb642..67e7e11f6 100644 --- a/extra/string-extra/phpunit.xml.dist +++ b/extra/string-extra/phpunit.xml.dist @@ -1,6 +1,6 @@ - - + + ./ @@ -8,7 +8,7 @@ ./Tests ./vendor - + diff --git a/extra/twig-extra-bundle/composer.json b/extra/twig-extra-bundle/composer.json index 5a4302954..f65246f0e 100644 --- a/extra/twig-extra-bundle/composer.json +++ b/extra/twig-extra-bundle/composer.json @@ -40,7 +40,6 @@ }, "require-dev": { "league/commonmark": "^2.7", - "symfony/phpunit-bridge": "^6.4|^7.0", "twig/cache-extra": "^3.0", "twig/cssinliner-extra": "^3.0", "twig/html-extra": "^3.0", diff --git a/extra/twig-extra-bundle/phpunit.xml.dist b/extra/twig-extra-bundle/phpunit.xml.dist index 1c0a78043..96fd0a2f8 100644 --- a/extra/twig-extra-bundle/phpunit.xml.dist +++ b/extra/twig-extra-bundle/phpunit.xml.dist @@ -1,6 +1,6 @@ - - + + ./ @@ -8,11 +8,10 @@ ./Tests ./vendor - + -