Start of upgrade to PHP7 mode and PHPUnit6

Now requires HHVM 3.20.2 or later.

.gitlab-ci.yml

@@ -7,6 +7,7 @@ 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"
   - ./tests/composer.sh
   - composer install
 
@@ -18,7 +19,7 @@ hack-min:
   script:
     - hh_server --check .
   stage: typecheck
-  image: hhvm/hhvm:3.12-lts-latest
+  image: hhvm/hhvm:3.20.2
   tags:
     - docker
 
@@ -34,7 +35,7 @@ phpunit-min:
   script:
     - hhvm vendor/bin/phpunit --bootstrap tests/HHITest.php tests/
   stage: test
-  image: hhvm/hhvm:3.12-lts-latest
+  image: hhvm/hhvm:3.20.2
   tags:
     - docker
 

composer.json

@@ -5,7 +5,7 @@
   "homepage": "https://git.simon.geek.nz/91-carriage/phpunit-hhi",
   "license": ["MIT"],
   "require": {
-    "hhvm": ">=3.12.0"
+    "hhvm": ">=3.20.2"
   },
   "extra": {
     "branch-alias": {
@@ -22,7 +22,7 @@
     }
   },
   "conflict": {
-    "phpunit/phpunit": "<6.0.0"
+    "phpunit/phpunit": "<6.2.0"
   },
   "suggest": {
     "91carriage/dbunit-hhi": "HHI files for use with DbUnit"

tests/HHITest.php

@@ -2,7 +2,7 @@
 
 namespace PHPUnitHHI;
 
-abstract class HHITest extends \PHPUnit_Framework_TestCase {
+abstract class HHITest extends \PHPUnit\Framework\TestCase {
   protected function parseFile(string $testName): \ConstMap<string, string> {
     $file = __DIR__.'/runs/'.$testName.'.hhit';
     $parts = explode('---', file_get_contents($file));