Skip to content

Commit fda8533

Browse files
authored
Merge pull request #41 from clue-labs/php7.4
Run tests on PHP 7.4 and simplify test matrix
2 parents 0f6e328 + 53313fa commit fda8533

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.travis.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
language: php
22

3-
php:
4-
# - 5.3 # requires old distro, see below
5-
- 5.4
6-
- 5.5
7-
- 5.6
8-
- 7.0
9-
- 7.1
10-
- 7.2
11-
- 7.3
12-
- hhvm # ignore errors, see below
13-
143
# lock distro so new future defaults will not break the build
154
dist: trusty
165

176
matrix:
187
include:
198
- php: 5.3
209
dist: precise
10+
- php: 5.4
11+
- php: 5.5
12+
- php: 5.6
13+
- php: 7.0
14+
- php: 7.1
15+
- php: 7.2
16+
- php: 7.3
17+
- php: 7.4
18+
- php: hhvm-3.18
19+
install: composer require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
2120
allow_failures:
22-
- php: hhvm
21+
- php: hhvm-3.18
2322

2423
install:
2524
- composer install --no-interaction

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"react/promise": "^2.7.0 || ^1.2.1"
2424
},
2525
"require-dev": {
26-
"phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
26+
"phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"
2727
}
2828
}

tests/FunctionRejectTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public function testWaitingForPromiseToRejectDoesNotLeaveGarbageCycles()
5454
}
5555

5656
gc_collect_cycles();
57+
gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
5758

5859
$promise = Timer\reject(0.01, $this->loop);
5960
$this->loop->run();

0 commit comments

Comments
 (0)