Skip to content

Commit 1a5fd42

Browse files
committed
Update test environment to report failed assertions
1 parent 1bc5337 commit 1a5fd42

File tree

5 files changed

+26
-5
lines changed

5 files changed

+26
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
with:
3333
php-version: ${{ matrix.php }}
3434
coverage: xdebug
35+
ini-file: development
3536
- run: composer install
3637
- run: vendor/bin/phpunit --coverage-text
3738
if: ${{ matrix.php >= 7.3 }}
@@ -57,7 +58,7 @@ jobs:
5758
continue-on-error: true
5859
steps:
5960
- uses: actions/checkout@v3
60-
- run: cp `which composer` composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
61+
- run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
6162
- name: Run hhvm composer.phar install
6263
uses: docker://hhvm/hhvm:3.30-lts-latest
6364
with:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"react/stream": "^1.2"
3636
},
3737
"require-dev": {
38-
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
38+
"phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
3939
"react/async": "^4 || ^3 || ^2",
4040
"react/promise-stream": "^1.4"
4141
},

phpunit.xml.dist

Lines changed: 11 additions & 3 deletions
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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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>

tests/IntegrationTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ public function testWaitingForRejectedConnectionShouldNotCreateAnyGarbageReferen
147147
if (class_exists('React\Promise\When')) {
148148
$this->markTestSkipped('Not supported on legacy Promise v1 API');
149149
}
150+
if (DIRECTORY_SEPARATOR === '\\' && PHP_VERSION_ID > 80100) {
151+
$this->markTestSkipped('Not supported on Windows with PHP 8.1+');
152+
}
150153

151154
$connector = new Connector(array('timeout' => false));
152155

@@ -186,6 +189,7 @@ public function testWaitingForConnectionTimeoutDuringDnsLookupShouldNotCreateAny
186189
$connector = new Connector(array('timeout' => 0.001));
187190

188191
gc_collect_cycles();
192+
gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
189193

190194
$wait = true;
191195
$promise = $connector->connect('google.com:80')->then(

0 commit comments

Comments
 (0)