Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand All @@ -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: |
Expand All @@ -179,7 +169,7 @@ jobs:
# "€ 1000000.00" instead of "€1,000,000.00". phpunit.xml.dist's <env> 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"
Expand Down
3 changes: 0 additions & 3 deletions extra/cache-extra/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
6 changes: 3 additions & 3 deletions extra/cache-extra/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnRisky="true" failOnWarning="true">
<coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnDeprecation="true" failOnNotice="true" failOnRisky="true" failOnWarning="true">
<source ignoreSuppressionOfDeprecations="true">
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>
</source>
<php>
<ini name="error_reporting" value="-1"/>
</php>
Expand Down
5 changes: 2 additions & 3 deletions extra/cssinliner-extra/Tests/LegacyFunctionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions extra/cssinliner-extra/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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\\" : "" },
Expand Down
6 changes: 3 additions & 3 deletions extra/cssinliner-extra/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnRisky="true" failOnWarning="true">
<coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnDeprecation="true" failOnNotice="true" failOnRisky="true" failOnWarning="true">
<source ignoreSuppressionOfDeprecations="true">
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>
</source>
<php>
<ini name="error_reporting" value="-1"/>
</php>
Expand Down
5 changes: 2 additions & 3 deletions extra/html-extra/Tests/LegacyFunctionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions extra/html-extra/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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\\" : "" },
Expand Down
6 changes: 3 additions & 3 deletions extra/html-extra/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnRisky="true" failOnWarning="true">
<coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnDeprecation="true" failOnNotice="true" failOnRisky="true" failOnWarning="true">
<source ignoreSuppressionOfDeprecations="true">
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>
</source>
<php>
<ini name="error_reporting" value="-1"/>
</php>
Expand Down
5 changes: 2 additions & 3 deletions extra/inky-extra/Tests/LegacyFunctionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions extra/inky-extra/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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\\" : "" },
Expand Down
6 changes: 3 additions & 3 deletions extra/inky-extra/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnRisky="true" failOnWarning="true">
<coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnDeprecation="true" failOnNotice="true" failOnRisky="true" failOnWarning="true">
<source ignoreSuppressionOfDeprecations="true">
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>
</source>
<php>
<ini name="error_reporting" value="-1"/>
</php>
Expand Down
3 changes: 0 additions & 3 deletions extra/intl-extra/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
6 changes: 3 additions & 3 deletions extra/intl-extra/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnRisky="true" failOnWarning="true">
<coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnDeprecation="true" failOnNotice="true" failOnRisky="true" failOnWarning="true">
<source ignoreSuppressionOfDeprecations="true">
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>
</source>
<php>
<env name="LANG" value="en_US.UTF-8" force="true"/>
<ini name="error_reporting" value="-1"/>
Expand Down
5 changes: 2 additions & 3 deletions extra/markdown-extra/Tests/LegacyFunctionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion extra/markdown-extra/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions extra/markdown-extra/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnRisky="true" failOnWarning="true">
<coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnDeprecation="true" failOnNotice="true" failOnRisky="true" failOnWarning="true">
<source ignoreSuppressionOfDeprecations="true">
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>
</source>
<php>
<ini name="error_reporting" value="-1"/>
</php>
Expand Down
3 changes: 0 additions & 3 deletions extra/string-extra/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
6 changes: 3 additions & 3 deletions extra/string-extra/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnRisky="true" failOnWarning="true">
<coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnDeprecation="true" failOnNotice="true" failOnRisky="true" failOnWarning="true">
<source ignoreSuppressionOfDeprecations="true">
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>
</source>
<php>
<ini name="error_reporting" value="-1"/>
</php>
Expand Down
1 change: 0 additions & 1 deletion extra/twig-extra-bundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 3 additions & 4 deletions extra/twig-extra-bundle/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="phpunit-bootstrap.php" failOnRisky="true" failOnWarning="true">
<coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="phpunit-bootstrap.php" failOnDeprecation="true" failOnNotice="true" failOnRisky="true" failOnWarning="true">
<source ignoreSuppressionOfDeprecations="true">
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>
</source>
<php>
<ini name="error_reporting" value="-1"/>
<server name="KERNEL_CLASS" value="Twig\Extra\TwigExtraBundle\Tests\Fixture\Kernel"/>
<server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0"/>
</php>
<testsuites>
<testsuite name="Twig Extra bundle Test Suite">
Expand Down
Loading