Skip to content

Commit 44a7ceb

Browse files
authored
Merge pull request #242 from clue-labs/1-update-tests
[1.x] Update test suite and report failed assertions
2 parents cbd7f05 + 0cbdf0b commit 44a7ceb

File tree

4 files changed

+36
-15
lines changed

4 files changed

+36
-15
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 9 deletions
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:
@@ -21,11 +21,12 @@ jobs:
2121
- 5.4
2222
- 5.3
2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2525
- uses: shivammathur/setup-php@v2
2626
with:
2727
php-version: ${{ matrix.php }}
2828
coverage: xdebug
29+
ini-file: development
2930
- run: composer install
3031
- run: vendor/bin/phpunit --coverage-text
3132
if: ${{ matrix.php >= 7.3 }}
@@ -34,13 +35,16 @@ jobs:
3435

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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"php": ">=5.3.3"
1010
},
1111
"require-dev": {
12-
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
12+
"phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36"
1313
},
1414
"autoload": {
1515
"psr-4": {

phpunit.xml.dist

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
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"
7+
cacheResult="false"
78
colors="true"
8-
cacheResult="false">
9+
convertDeprecationsToExceptions="true">
910
<testsuites>
1011
<testsuite name="Promise Test Suite">
1112
<directory>./tests/React/Promise/</directory>
@@ -16,4 +17,12 @@
1617
<directory>./src/</directory>
1718
</include>
1819
</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>
1928
</phpunit>

phpunit.xml.legacy

Lines changed: 9 additions & 1 deletion
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 before PHPUnit 9 -->
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)