diff --git a/.gitattributes b/.gitattributes index 85c4bac..c8bc180 100644 --- a/.gitattributes +++ b/.gitattributes @@ -53,3 +53,12 @@ *.ttf -text diff *.woff -text diff *.woff2 -text diff + +# Exclude directories/files from composer vendor package +/tests export-ignore +/.* export-ignore +/php*.json export-ignore +/php*.xml export-ignore +/php*.dist export-ignore +/php*.neon export-ignore +/renovate.json export-ignore diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c600d09..04cb0ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,12 +11,18 @@ permissions: jobs: test: - name: PHP ${{ matrix.php-versions }} Test ${{ matrix.composer-flags }} + name: PHP ${{ matrix.php-versions }} - Symfony ${{ matrix.symfony }} - Test ${{ matrix.composer-flags }} + env: + SYMFONY_REQUIRE: ${{ matrix.symfony }} runs-on: ubuntu-latest strategy: matrix: - php-versions: ['8.1', '8.2'] - composer-flags: ['', '--prefer-lowest'] + php-versions: [ '8.1', '8.2', '8.3' ] + symfony: [ '^6.0', '^7.0' ] + composer-flags: [ '', '--prefer-lowest' ] + exclude: + - php-versions: 8.1 + symfony: '^7.0' steps: - uses: actions/checkout@v4 @@ -26,6 +32,9 @@ jobs: php-version: ${{ matrix.php-versions }} coverage: none + - name: Add symfony flex + run: composer global config --no-interaction allow-plugins.symfony/flex true && composer global require symfony/flex + - name: Validate composer.json and composer.lock run: composer validate @@ -45,7 +54,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: 8.3 coverage: pcov - name: Install dependencies diff --git a/README.md b/README.md index a75a9d0..0e8ed8d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.1-8892BF)](https://php.net/) +![Run tests](https://github.com/123inkt/phpunit-extensions/actions/workflows/test.yml/badge.svg) ## PHPUnit extensions diff --git a/composer.json b/composer.json index a4a4c32..ab14d75 100644 --- a/composer.json +++ b/composer.json @@ -24,11 +24,11 @@ "phpstan/phpstan-symfony": "^1.2.16", "roave/security-advisories": "dev-latest", "squizlabs/php_codesniffer": "^3.7", - "symfony/form": "^6.0", - "symfony/framework-bundle": "^6.0", - "symfony/security-core": "^6.0", - "symfony/twig-bundle": "^6.0", - "symfony/validator": "^6.0" + "symfony/form": "^6.0||^7.0", + "symfony/framework-bundle": "^6.0||^7.0", + "symfony/security-core": "^6.0||^7.0", + "symfony/twig-bundle": "^6.0||^7.0", + "symfony/validator": "^6.0||^7.0" }, "scripts": { "check": ["@check:phpstan", "@check:phpmd", "@check:phpcs"],