Skip to content

Commit

Permalink
Remove PhpunitBridge and install PHPunit 11
Browse files Browse the repository at this point in the history
  • Loading branch information
wouterj committed Dec 12, 2024
1 parent 699ae49 commit 95c1cc0
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 17 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ jobs:
- name: "Install dependencies"
run: composer install --ansi --no-interaction --no-progress

- name: Install PHPUnit
id: install
run: vendor/bin/simple-phpunit install

- name: Lint YAML files
if: always() && steps.install.outcome == 'success'
run: ./bin/console lint:yaml config --parse-tags
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ on:

env:
fail-fast: true
PHPUNIT_FLAGS: "-v"
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
SYMFONY_DEPRECATIONS_HELPER: 'max[indirect]=52'

permissions:
contents: read
Expand Down Expand Up @@ -68,11 +65,5 @@ jobs:
php bin/console sass:build
php bin/console asset-map:compile
- name: "Install PHPUnit"
run: vendor/bin/simple-phpunit install

- name: "PHPUnit version"
run: vendor/bin/simple-phpunit --version

- name: "Run tests"
run: vendor/bin/simple-phpunit ${{ env.PHPUNIT_FLAGS }}
run: bin/phpunit
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@
###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###

###> phpunit/phpunit ###
/phpunit.xml
.phpunit.result.cache
###< phpunit/phpunit ###
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
"phpstan/phpstan": "^1.2",
"phpstan/phpstan-doctrine": "^1.3",
"phpstan/phpstan-symfony": "^1.2",
"phpunit/phpunit": "^11.3",
"symfony/browser-kit": "^7",
"symfony/css-selector": "^7",
"symfony/debug-bundle": "^7",
"symfony/maker-bundle": "^1.36",
"symfony/phpunit-bridge": "^7",
"symfony/stopwatch": "^7",
"symfony/web-profiler-bundle": "^7",
"twbs/bootstrap": "^5"
Expand Down
2 changes: 0 additions & 2 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ parameters:
paths:
- src
- tests
bootstrapFiles:
- vendor/bin/.phpunit/phpunit/vendor/autoload.php
doctrine:
objectManagerLoader: tests/object-manager.php
symfony:
Expand Down
14 changes: 14 additions & 0 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,20 @@
"phpstan.dist.neon"
]
},
"phpunit/phpunit": {
"version": "11.5",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "9.6",
"ref": "7364a21d87e658eb363c5020c072ecfdc12e2326"
},
"files": [
".env.test",
"phpunit.xml.dist",
"tests/bootstrap.php"
]
},
"symfony/apache-pack": {
"version": "1.0",
"recipe": {
Expand Down

0 comments on commit 95c1cc0

Please sign in to comment.