From 1b01450af489b073b720e5d5c27c3a6703188426 Mon Sep 17 00:00:00 2001
From: Fred Emmott <fe@fb.com>
Date: Fri, 7 Feb 2020 12:37:42 -0800
Subject: [PATCH] Dockerify unit testing for HSL 1.4 (#122)

* Dockerify unit testing for HSL 1.4

* Remove <<__RxShallow>> - hhvm too old
---
 .travis.sh  | 25 ++++++++++++++++++++-----
 .travis.yml | 15 +++++++++++----
 src/Ref.php |  1 -
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index b4be4756..1c7850e0 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,12 +1,27 @@
 #!/bin/sh
 set -ex
+apt update -y
+DEBIAN_FRONTEND=noninteractive apt install -y php-cli zip unzip
 hhvm --version
+php --version
+if [ ! -e .git/refs/heads/master ]; then
+  # - Travis clones with `--branch`, then moves to a detached HEAD state
+  # - if we're on a detached HEAD, Composer uses master to resolve branch
+  #   aliases.
+  # So, create the master branch :p
+  git branch master HEAD
+fi
 
-composer install
+(
+  cd $(mktemp -d)
+  curl https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+)
+if (hhvm --version | grep -q -- -dev); then
+  # Doesn't exist in master, but keep it here so that we can test release
+  # branches on nightlies too
+  rm -f composer.lock
+fi
+hhvm $(which composer) install
 
 hh_client
-
 hhvm vendor/bin/phpunit tests/
-
-echo > .hhconfig
-hh_server --check $(pwd)
diff --git a/.travis.yml b/.travis.yml
index bf46053a..ae295dc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,14 @@
-language: php
-php:
- - hhvm-3.24
+sudo: required
+language: generic
+services: docker
+env:
+- HHVM_VERSION=3.24-lts-latest
+- HHVM_VERSION=3.25.3
+install:
+- docker pull hhvm/hhvm:$HHVM_VERSION
 script:
- - ./.travis.sh
+- docker run --rm -w /var/source -v $(pwd):/var/source hhvm/hhvm:$HHVM_VERSION ./.travis.sh
 notifications:
   webhooks: https://code.facebook.com/travis/webhook/
+  slack:
+    secure: LH2n9tQoW3/OUO/ppXLnGIVAbYtl07avQne/gkcal/csGc18BSly15/bNZvGTlC65aac+yjbGHlcWuBm8Qyl5l2oWZADqoRN7+HeOYw1qSx2eRA5BzVcdKd9eHjl5xobxLC2NXZL/NSiN+Ku/YDuzzkwpGqIcC4EiwvFsab6B2rigdazFaNRceAxnyYwNs3VdzFj9vBDqbfUDFV7lgjZJxbKos26O/Z4F58a2tsV2hbT+tF8W3hfPrMaYuxWVv2+Irc0uGoNc5EG+2eRT5AzMtp6YKzQ5LzEkC/lNwojUg/dr9xV+3vZu+IARy7HsBuX5KZo3IBGHL18q8srgEM4NBQy8IUmVAlGGw7vw1cInIoqUTOvHBqVvDAs2RNr5f7u+2Li0Sw9vuGhoeNtLVvTjZ9r5XmEzdEx9pUFrsO16YdJLnpiYiyWlWAeAkDljXD/d5L/i0sZgaeY/eubYADJr/ZA+M78aiLuw5eEWqu5s9a4xhrGEBkUHyPRpXU1AxVAPr1L6/PK47QKYu1h45QfMQL8TmrNw9VPLUIm5P4k3RFz9CC5C35u5HfFTubErcDl1CZUSoGUuW4foTbkWSJGlgvQquS824mL2VIO5Ut6J6+/2iqsK/HfKOiToDpiiwpe2KoQsyy5QHVWMVNTuKPou1yYH+6Z3DIx8/wEAkvCA+U=
diff --git a/src/Ref.php b/src/Ref.php
index b102f1ba..d0c368a0 100644
--- a/src/Ref.php
+++ b/src/Ref.php
@@ -24,6 +24,5 @@
  * to avoid this class.
  */
 final class Ref<T> {
-  <<__RxShallow>>
   public function __construct(public T $value) {}
 }