From 568bfa6ef8e8f7c80008b39ece0742991043b74a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Thu, 26 Apr 2018 19:35:33 -0300
Subject: [PATCH] Remove phpunit.xml.hhvm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 doc/faq.rst      |  4 +++-
 phpunit.xml.hhvm | 31 -------------------------------
 test/ci-test     | 11 +----------
 3 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 phpunit.xml.hhvm

diff --git a/doc/faq.rst b/doc/faq.rst
index 3402919881..e31fc92324 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -433,7 +433,9 @@ releases.
 PHP 7 is supported since phpMyAdmin 4.6, PHP 7.1 is supported since 4.6.5,
 PHP 7.2 is supported since 4.7.4.
 
-phpMyAdmin also works fine with HHVM.
+HHVM is supported up to phpMyAdmin 4.8.
+
+Since release 5.0, phpMyAdmin supports only PHP 7.1 and newer.
 
 .. _faq1_32:
 
diff --git a/phpunit.xml.hhvm b/phpunit.xml.hhvm
deleted file mode 100644
index 956a0d5e0a..0000000000
--- a/phpunit.xml.hhvm
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="test/bootstrap-dist.php"
-         backupGlobals="true"
-         backupStaticAttributes="false"
-         strict="true"
-         timeoutForSmallTests="10"
-         timeoutForMediumTests="30"
-         colors="true"
-         verbose="true">
-
-    <testsuites>
-        <testsuite name="Classes">
-            <directory suffix="Test.php">test/classes</directory>
-        </testsuite>
-        <testsuite name="Engines">
-            <directory suffix="_test.php">test/engines</directory>
-        </testsuite>
-        <testsuite name="Unit">
-            <file>test/Environment_test.php</file>
-            <directory suffix="_test.php">test/libraries/core</directory>
-            <directory suffix="_test.php">test/libraries/common</directory>
-            <directory suffix="_test.php">test/libraries/rte</directory>
-            <directory suffix="_test.php">test/libraries</directory>
-        </testsuite>
-    </testsuites>
-
-    <logging>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
-        <log type="json" target="build/logs/phpunit.json" />
-    </logging>
-</phpunit>
diff --git a/test/ci-test b/test/ci-test
index 1bd4497897..1717e8f984 100755
--- a/test/ci-test
+++ b/test/ci-test
@@ -1,12 +1,3 @@
 #!/bin/sh
 
-case "$TRAVIS_PHP_VERSION" in
-    hhvm*)
-        CONFIG=phpunit.xml.hhvm
-        ;;
-    *)
-        CONFIG=phpunit.xml.dist
-        ;;
-esac
-
-./vendor/bin/phpunit --configuration $CONFIG --exclude-group selenium
+./vendor/bin/phpunit --configuration phpunit.xml.dist --exclude-group selenium