Skip to content

Commit 44f0a80

Browse files
committed
Update test suite and report failed assertions
1 parent b5e4ac8 commit 44f0a80

File tree

4 files changed

+40
-16
lines changed

4 files changed

+40
-16
lines changed

.github/workflows/ci.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
PHPUnit:
99
name: PHPUnit (PHP ${{ matrix.php }})
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
strategy:
1212
matrix:
1313
php:
@@ -24,11 +24,12 @@ jobs:
2424
- 5.4
2525
- 5.3
2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v3
2828
- uses: shivammathur/setup-php@v2
2929
with:
3030
php-version: ${{ matrix.php }}
3131
coverage: xdebug
32+
ini-file: development
3233
- run: composer install
3334
- run: vendor/bin/phpunit --coverage-text
3435
if: ${{ matrix.php >= 7.3 }}
@@ -37,13 +38,16 @@ jobs:
3738

3839
PHPUnit-hhvm:
3940
name: PHPUnit (HHVM)
40-
runs-on: ubuntu-18.04
41+
runs-on: ubuntu-22.04
4142
continue-on-error: true
4243
steps:
43-
- uses: actions/checkout@v2
44-
- uses: azjezz/setup-hhvm@v1
44+
- uses: actions/checkout@v3
45+
- run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
46+
- name: Run hhvm composer.phar install
47+
uses: docker://hhvm/hhvm:3.30-lts-latest
4548
with:
46-
version: lts-3.30
47-
- run: composer self-update --2.2 # downgrade Composer for HHVM
48-
- run: hhvm $(which composer) install
49-
- run: hhvm vendor/bin/phpunit
49+
args: hhvm composer.phar install
50+
- name: Run hhvm vendor/bin/phpunit
51+
uses: docker://hhvm/hhvm:3.30-lts-latest
52+
with:
53+
args: hhvm vendor/bin/phpunit

composer.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,18 @@
4141
"clue/http-proxy-react": "^1.8",
4242
"clue/reactphp-ssh-proxy": "^1.4",
4343
"clue/socks-react": "^1.4",
44-
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
44+
"phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
4545
"react/async": "^4 || ^3 || ^2",
4646
"react/promise-timer": "^1.9"
4747
},
4848
"autoload": {
49-
"psr-4": { "React\\Http\\": "src" }
49+
"psr-4": {
50+
"React\\Http\\": "src/"
51+
}
5052
},
5153
"autoload-dev": {
52-
"psr-4": { "React\\Tests\\Http\\": "tests" }
54+
"psr-4": {
55+
"React\\Tests\\Http\\": "tests/"
56+
}
5357
}
5458
}

phpunit.xml.dist

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
4-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
3+
<!-- PHPUnit configuration file with new format for PHPUnit 9.5+ -->
4+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
66
bootstrap="vendor/autoload.php"
77
cacheResult="false"
88
colors="true"
@@ -17,4 +17,12 @@
1717
<directory>./src/</directory>
1818
</include>
1919
</coverage>
20+
<php>
21+
<ini name="error_reporting" value="-1" />
22+
<!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
23+
<!-- <ini name="zend.assertions=1" value="1" /> -->
24+
<ini name="assert.active" value="1" />
25+
<ini name="assert.exception" value="1" />
26+
<ini name="assert.bail" value="0" />
27+
</php>
2028
</phpunit>

phpunit.xml.legacy

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
3+
<!-- PHPUnit configuration file with old format for legacy PHPUnit -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
66
bootstrap="vendor/autoload.php"
@@ -15,4 +15,12 @@
1515
<directory>./src/</directory>
1616
</whitelist>
1717
</filter>
18+
<php>
19+
<ini name="error_reporting" value="-1" />
20+
<!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
21+
<!-- <ini name="zend.assertions=1" value="1" /> -->
22+
<ini name="assert.active" value="1" />
23+
<ini name="assert.exception" value="1" />
24+
<ini name="assert.bail" value="0" />
25+
</php>
1826
</phpunit>

0 commit comments

Comments
 (0)