No longer run HHVM via Docker

Author: thekid

.travis.sh

@@ -2,51 +2,13 @@
 
 XP_RUNNERS_URL=https://dl.bintray.com/xp-runners/generic/xp-run-master.sh
 
-wrap() {
-  local image="$1"
-  local cmd="$2"
-  local target="$3"
-  local wrapper=$(basename $target).in
-  local wd=$(pwd)
-
-  mv $target $wrapper
-  echo "#!/bin/sh" > $target
-  echo "docker run --rm -v $wd:/opt/src -v $wd/php.ini:/etc/hhvm/php.ini -w /opt/src $image $cmd $wrapper \$@" >> $target
-  chmod 755 $target
-}
-
-replace_hhvm_with() {
-  local version="$1"
-
-  printf "\033[33;1mReplacing HHVM\033[0m\n"
-  docker pull hhvm/hhvm:$version
-  docker run --rm hhvm/hhvm:$version hhvm --version
-  echo
-
-  echo "hhvm.php7.all = 1" > php.ini
-  echo "hhvm.hack.lang.look_for_typechecker = 0" >> php.ini
-  wrap hhvm/hhvm:$version "hhvm --php" /home/travis/.phpenv/versions/hhvm/bin/composer
-  wrap hhvm/hhvm:$version "sh" xp-run
-}
-
 case $1 in
   install)
     printf "\033[33;1mInstalling XP Runners\033[0m\n"
     echo $XP_RUNNERS_URL
     curl -SL $XP_RUNNERS_URL > xp-run
     echo
 
-    # Run HHVM inside Docker as the versions provided by Travis-CI are too old
-    case "$TRAVIS_PHP_VERSION" in
-      hhvm-nightly*)
-        replace_hhvm_with "latest"
-      ;;
-
-      hhvm*)
-        replace_hhvm_with "3.20.1"
-      ;;
-    esac
-
     printf "\033[33;1mRunning Composer\033[0m\n"
     composer install
   ;;

.travis.yml

@@ -2,9 +2,6 @@ dist: trusty
 
 language: php
 
-services:
-  - docker
-
 php:
   - 7.0
   - 7.1

src/main/php/lang/ClassLoader.class.php

@@ -220,7 +220,7 @@ protected static function defineForward($name, $func, $invoke) {
       $p= $param->getName();
 
       if ($param->isVariadic()) {
-        $sig.= defined('HHVM_VERSION') ? ',... $'.$p  : ', '.$param->getType().'... $'.$p;
+        $sig.= defined('HHVM_VERSION') ? ', ... $'.$p  : ', '.$param->getType().'... $'.$p;
         $pass.= ', ...$'.$p;
       } else {
         $sig.= ', '.$param->getType().' $'.$p;