Skip to content

Commit

Permalink
Try to get rid of phpunit bridge
Browse files Browse the repository at this point in the history
  • Loading branch information
Seldaek committed Aug 22, 2024
1 parent 36cd462 commit 7985314
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 42 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ jobs:
os: windows-latest

steps:
- uses: "actions/checkout@v4"
- uses: actions/checkout@v4

- uses: "shivammathur/setup-php@v2"
- uses: shivammathur/setup-php@v2
with:
coverage: "none"
php-version: "${{ matrix.php-version }}"
coverage: none

- uses: "ramsey/composer-install@v3"
- uses: ramsey/composer-install@v3
with:
dependency-versions: highest

- name: "Run tests"
run: "vendor/bin/simple-phpunit --verbose"
- name: Run tests
run: composer test
15 changes: 6 additions & 9 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,16 @@ jobs:
- "8.3"

steps:
- uses: "actions/checkout@v4"
- uses: actions/checkout@v4

- uses: "shivammathur/setup-php@v2"
- uses: shivammathur/setup-php@v2
with:
coverage: "none"
php-version: "${{ matrix.php-version }}"
coverage: none

- uses: "ramsey/composer-install@v3"
- uses: ramsey/composer-install@v3
with:
dependency-versions: highest

- name: "Initialize PHPUnit sources"
run: "vendor/bin/simple-phpunit --filter NO_TEST_JUST_AUTOLOAD_THANKS"

- name: "Run PHPStan"
run: "composer phpstan"
- name: Run PHPStan
run: composer phpstan
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"composer/pcre": "^2.1 || ^3.1"
},
"require-dev": {
"symfony/phpunit-bridge": "^5",
"phpunit/phpunit": "^8",
"phpstan/phpstan": "^1.6",
"phpstan/phpstan-deprecation-rules": "^1",
"phpstan/phpstan-strict-rules": "^1.1",
Expand All @@ -42,7 +42,7 @@
}
},
"scripts": {
"test": "SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 vendor/bin/simple-phpunit",
"test": "vendor/bin/phpunit",
"phpstan": "phpstan analyse"
}
}
3 changes: 0 additions & 3 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,5 @@ parameters:
reportUnmatchedIgnoredErrors: false
treatPhpDocTypesAsCertain: false

bootstrapFiles:
- tests/phpstan-locate-phpunit-autoloader.php

excludePaths:
- 'tests/Fixtures/*'
22 changes: 0 additions & 22 deletions tests/phpstan-locate-phpunit-autoloader.php

This file was deleted.

0 comments on commit 7985314

Please sign in to comment.