Commit 1b0e8f60 authored by Simon Welsh's avatar Simon Welsh

Merge branch 'phpunit-5.7' into phpunit-6.2

parents 185de1f7 b2ca7d22
.gitlab-ci.yml export-ignore
composer.lock export-ignore
tests/ export-ignore
......@@ -4,24 +4,17 @@ stages:
- deploy
before_script:
- apt-get update
- apt-get install -y wget curl
- "echo 'assume_php=false' > .hhconfig"
- "echo 'hhvm.php7.all=1' >> /etc/hhvm/php.ini"
- "echo 'assume_php=false' > .hhconfig"
- echo 'enable_experimental_tc_features = safe_pass_by_ref' >> .hhconfig
- ./tests/composer.sh
- composer install
cache:
paths:
- vendor/
key: "$CI_COMMIT_REF_NAME"
untracked: true
hack-min:
script:
- hh_server --check .
stage: typecheck
image: hhvm/hhvm:3.20.2
image: hhvm/hhvm:3.23.0
tags:
- docker
......@@ -37,7 +30,7 @@ phpunit-min:
script:
- hhvm vendor/bin/phpunit --bootstrap tests/HHITest.php tests/
stage: test
image: hhvm/hhvm:3.20.2
image: hhvm/hhvm:3.23.0
tags:
- docker
......
......@@ -5,7 +5,7 @@
"homepage": "https://git.simon.geek.nz/91-carriage/phpunit-hhi",
"license": ["MIT"],
"require": {
"hhvm": ">=3.20.2"
"hhvm": ">=3.23.0"
},
"extra": {
"branch-alias": {
......
This diff is collapsed.
......@@ -7,7 +7,7 @@ abstract class HHITest extends \PHPUnit\Framework\TestCase {
$file = __DIR__.'/runs/'.$testName.'.hhit';
$parts = explode('---', file_get_contents($file));
$head = array_shift($parts);
$head = array_shift(&$parts);
$this->assertEmpty(
$head,
'File for test '.$testName.' has invalid start',
......@@ -42,7 +42,7 @@ abstract class HHITest extends \PHPUnit\Framework\TestCase {
$ret = null;
$output_arr = null;
$output = \exec($cmd, $output_arr, $ret);
$output = \exec($cmd, &$output_arr, &$ret);
$json = @\json_decode($output, true);
......@@ -85,8 +85,8 @@ abstract class HHITest extends \PHPUnit\Framework\TestCase {
return strcmp($err1['error'], $err2['error']);
};
usort($actualErrors, $sorter);
usort($expectedErrors, $sorter);
usort(&$actualErrors, $sorter);
usort(&$expectedErrors, $sorter);
$this->assertEquals($expectedErrors, $actualErrors);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment