Merge branch '2.6' into 3.6

Author: GrahamCampbell

.gitattributes

@@ -6,7 +6,6 @@
 /.github export-ignore
 /.gitignore export-ignore
 /.github export-ignore
-/.travis.yml export-ignore
 /phpunit.xml.dist export-ignore
 /README.md export-ignore
 /UPGRADING.md export-ignore

.github/bin/composer.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+EXPECTED_CHECKSUM="$(wget -q -O - https://composer.github.io/installer.sig)"
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
+  >&2 echo 'ERROR: Invalid installer checksum'
+  rm composer-setup.php
+  exit 1
+else
+  php composer-setup.php --install-dir="/usr/bin" --filename=composer
+  RESULT=$?
+  rm composer-setup.php
+  composer config platform.php 5.6.50
+  exit $RESULT
+fi

.github/bin/hhvm.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "deb https://dl.hhvm.com/ubuntu $(lsb_release -sc)-lts-$1 main" >> /etc/apt/sources.list
+apt-get update
+apt-get --allow-downgrades --reinstall install hhvm/$(lsb_release -sc)-lts-$1

.github/workflows/tests.yml

@@ -5,13 +5,13 @@ on:
   pull_request:
 
 jobs:
-  tests:
+  php:
     name: PHP ${{ matrix.php }}
     runs-on: ubuntu-20.04
 
     strategy:
       matrix:
-        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
 
     steps:
       - name: Checkout Code
@@ -40,8 +40,38 @@ jobs:
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --no-interaction --no-progress --ignore-platform-reqs
+          command: composer update --no-interaction --no-progress --ignore-platform-req=php
         if: "matrix.php >= 8"
 
       - name: Execute PHPUnit
         run: vendor/bin/phpunit
+
+  hhvm:
+    name: HHVM ${{ matrix.hhvm }}
+    runs-on: ubuntu-16.04
+
+    strategy:
+      matrix:
+        hhvm: ["3.15", "3.18", "3.21", "3.24", "3.27", "3.30"]
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Install HHVM
+        shell: bash
+        run: sudo .github/bin/hhvm.sh ${{ matrix.hhvm }}
+
+      - name: Install Composer
+        shell: bash
+        run: sudo .github/bin/composer.sh
+
+      - name: Install Dependencies
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --no-interaction --no-progress
+
+      - name: Execute PHPUnit
+        run: hhvm vendor/bin/phpunit

.travis.yml

@@ -23,7 +23,7 @@
     "require-dev": {
         "ext-filter": "*",
         "ext-pcre": "*",
-        "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0"
+        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20"
     },
     "autoload": {
         "psr-4": {