Skip to content

Commit 0755533

Browse files
committed
Use PHPUnit directly
1 parent 04aaa11 commit 0755533

File tree

3 files changed

+14
-21
lines changed

3 files changed

+14
-21
lines changed

.github/workflows/continuous-integration.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,11 @@ jobs:
6464
- name: Install latest dependencies
6565
run: composer update ${{ env.COMPOSER_FLAGS }}
6666

67-
# Provides flexibilty for using either simple-phpunit or phpunit
68-
- name: Determine PHPUnit binary
69-
run: |
70-
name=$([ -f vendor/bin/simple-phpunit ] && echo simple-phpunit || echo phpunit)
71-
echo "BIN_PHPUNIT=vendor/bin/$name" >> $GITHUB_ENV
72-
shell: bash
73-
7467
- name: Run tests
75-
run: ${{ env.BIN_PHPUNIT }} --verbose
68+
if: ${{ !matrix.experimental }}
69+
run: vendor/bin/phpunit
70+
71+
# Show deprecations on PHP 8.4
72+
- name: Run tests (experimental)
73+
if: ${{ matrix.experimental }}
74+
run: vendor/bin/phpunit --display-deprecations

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"composer/pcre": "^1 || ^2 || ^3"
2424
},
2525
"require-dev": {
26-
"symfony/phpunit-bridge": "^6.0",
2726
"phpstan/phpstan": "^1.0",
28-
"phpstan/phpstan-strict-rules": "^1.1"
27+
"phpstan/phpstan-strict-rules": "^1.1",
28+
"phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
2929
},
3030
"autoload": {
3131
"psr-4": {
@@ -38,7 +38,7 @@
3838
}
3939
},
4040
"scripts": {
41-
"test": "@php vendor/bin/simple-phpunit",
41+
"test": "@php vendor/bin/phpunit",
4242
"phpstan": "@php vendor/bin/phpstan analyse"
4343
}
4444
}

phpunit.xml.dist

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
4-
colors="true"
5-
convertErrorsToExceptions="true"
6-
convertNoticesToExceptions="true"
7-
convertWarningsToExceptions="true"
8-
processIsolation="false"
9-
stopOnFailure="false"
10-
bootstrap="vendor/autoload.php"
11-
>
2+
<phpunit
3+
colors="true"
4+
bootstrap="vendor/autoload.php"
5+
>
126
<testsuites>
137
<testsuite name="XdebugHandler Test Suite">
148
<directory>tests</directory>

0 commit comments

Comments
 (0)