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
50 changes: 27 additions & 23 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
matrix:
php: [ 8.2, 8.3, 8.4 ]
symfony: [ 6.4.*, 7.3.*, 8.0.*-dev ]
symfony: [ 6.4.*, 7.4.*, 8.0.* ]
database: [ mysql|mongo ]
phpunit: [ 11, 12 ]
use-php-84-lazy-objects: [ 1 ]
Expand All @@ -41,37 +41,39 @@ jobs:
- {php: 8.3, phpunit: 11}
- {php: 8.4, phpunit: 11}

- {php: 8.2, symfony: 8.0.*}
- {php: 8.3, symfony: 8.0.*}

include:
# php 8.1
- {php: 8.1, symfony: 6.4.*, phpunit: 9, database: mysql}

# old PHPUnit versions
- {php: 8.3, symfony: '*', phpunit: 9, database: mysql}
- {php: 8.4, symfony: '*', phpunit: 10, database: mysql}
- {php: 8.4, symfony: '*', phpunit: 11, database: mysql}
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: mysql}
- {php: 8.4, symfony: 7.4.*, phpunit: 11, database: mysql}

# test with no database (PHPUnit 9 is used to prevent some problems with empty data providers)
- {php: 8.3, symfony: '*', phpunit: 9, database: none}
- {php: 8.3, symfony: '*', phpunit: 9, database: none, deps: lowest}
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: none}
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: none, deps: lowest}

# One permutation per DBMS
- {php: 8.4, symfony: '*', phpunit: 12, database: mongo}
- {php: 8.4, symfony: '*', phpunit: 12, database: pgsql}
- {php: 8.4, symfony: '*', phpunit: 12, database: sqlite}
- {php: 8.4, symfony: '*', phpunit: 12, database: mysql}
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mongo}
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: pgsql}
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: sqlite}
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mysql}

# lowest deps (one per DBMS)
- {php: 8.3, symfony: '*', phpunit: 9, database: mysql|mongo, deps: lowest}
- {php: 8.3, symfony: '*', phpunit: 9, database: mongo, deps: lowest}
- {php: 8.3, symfony: '*', phpunit: 9, database: pgsql, deps: lowest}
- {php: 8.3, symfony: '*', phpunit: 9, database: sqlite, deps: lowest}
- {php: 8.3, symfony: '*', phpunit: 9, database: mysql, deps: lowest}
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: mysql|mongo, deps: lowest}
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: mongo, deps: lowest}
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: pgsql, deps: lowest}
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: sqlite, deps: lowest}
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: mysql, deps: lowest}

# using Foundry's PHPUnit extension
- {php: 8.4, symfony: '*', phpunit: 12, database: mysql|mongo, use-phpunit-extension: 1}
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mysql|mongo, use-phpunit-extension: 1}

# disable lazy objects in PHP 8.4
- {php: 8.4, symfony: '*', phpunit: 12, database: mysql|mongo, use-php-84-lazy-objects: 0}
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mysql|mongo, use-php-84-lazy-objects: 0}
env:
DATABASE_URL: ${{ contains(matrix.database, 'mysql') && 'mysql://root:root@localhost:3306/foundry?serverVersion=5.7.42' || contains(matrix.database, 'pgsql') && 'postgresql://root:root@localhost:5432/foundry?serverVersion=15' || contains(matrix.database, 'sqlite') && 'sqlite:///%kernel.project_dir%/var/data.db' || '' }}
MONGO_URL: ${{ contains(matrix.database, 'mongo') && 'mongodb://127.0.0.1:27017/dbName?compressors=disabled&gssapiServiceName=mongodb' || '' }}
Expand Down Expand Up @@ -181,7 +183,7 @@ jobs:
dependency-versions: ${{ matrix.deps }}
composer-options: --prefer-dist
env:
SYMFONY_REQUIRE: 7.3.*
SYMFONY_REQUIRE: 7.4.*

- name: Set up MySQL
if: contains(matrix.database, 'mysql')
Expand Down Expand Up @@ -232,8 +234,7 @@ jobs:
- name: Test
run: |
vendor/bin/phpunit tests/Unit
vendor/bin/phpunit tests/Unit --exclude-group legacy-proxy
test-with-paratest:
name: Test with paratest
Expand Down Expand Up @@ -264,7 +265,7 @@ jobs:
dependency-versions: highest
composer-options: --prefer-dist
env:
SYMFONY_REQUIRE: 7.3.*
SYMFONY_REQUIRE: 7.4.*

- name: Set up MySQL
run: sudo /etc/init.d/mysql start
Expand All @@ -285,7 +286,7 @@ jobs:
MONGO_URL: mongodb://127.0.0.1:27017/dbName?compressors=disabled&gssapiServiceName=mongodb
USE_DAMA_DOCTRINE_TEST_BUNDLE: 1
USE_FOUNDRY_PHPUNIT_EXTENSION: 1
PHPUNIT_VERSION: 11
PHPUNIT_VERSION: 12
services:
mongo:
image: mongo:4
Expand All @@ -311,14 +312,17 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.4
coverage: xdebug
ini-values: xdebug.mode=coverage
tools: flex

- name: Install dependencies
uses: ramsey/composer-install@v2
with:
composer-options: --prefer-dist
env:
SYMFONY_REQUIRE: 7.4.x

- name: Test with coverage
run: ./phpunit --coverage-text --coverage-clover coverage.xml
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@ jobs:
with:
php-version: 8.4
coverage: none
tools: flex

- name: Install dependencies
uses: ramsey/composer-install@v2
with:
composer-options: --prefer-dist
env:
SYMFONY_REQUIRE: 7.4.*

- name: Install PHPStan
run: composer bin phpstan install
Expand Down Expand Up @@ -78,7 +81,7 @@ jobs:
uses: zenstruck/.github/.github/workflows/php-composer-validate.yml@main

composer-validate-psr:
name: PhpStan
name: Validate PSR-4
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand Down
3 changes: 2 additions & 1 deletion bin/tools/phpstan/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"phpstan/phpstan-symfony": "^2.0",
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan-doctrine": "^2.0",
"phpstan/phpstan-phpunit": "^2.0"
"phpstan/phpstan-phpunit": "^2.0",
"symfony/var-exporter": "^7"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

phpstan doctrine still needs var-exporter 7

},
"config": {
"allow-plugins": {
Expand Down
172 changes: 160 additions & 12 deletions bin/tools/phpstan/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"dama/doctrine-test-bundle": "^8.0",
"doctrine/collections": "^1.7|^2.0",
"doctrine/common": "^3.2.2",
"doctrine/doctrine-bundle": "^2.10",
"doctrine/doctrine-bundle": "^2.10|^3.0|3.1.x-dev",
"doctrine/doctrine-migrations-bundle": "^2.2|^3.0",
"doctrine/mongodb-odm": "^2.4",
"doctrine/mongodb-odm-bundle": "^4.6|^5.0",
Expand All @@ -40,7 +40,7 @@
"symfony/browser-kit": "^6.4|^7.0|^8.0",
"symfony/console": "^6.4|^7.0|^8.0",
"symfony/dotenv": "^6.4|^7.0|^8.0",
"symfony/event-dispatcher": "^6.4|^7.0",
"symfony/event-dispatcher": "^6.4|^7.0|^8.0",
"symfony/framework-bundle": "^6.4|^7.0|^8.0",
"symfony/maker-bundle": "^1.55",
"symfony/phpunit-bridge": "^6.4|^7.0|^8.0",
Expand Down
Loading