From ab07d70e3eaa15fa41f6d7dbd6c8b0431e3e7b6f Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 4 Jan 2019 13:22:58 -0800
Subject: [PATCH] [WIP] Fix false positive in Travis CI

The tests at https://travis-ci.org/perftools/xhgui/builds/475018345
for https://github.com/perftools/xhgui/pull/252 are passing on
for "PHP 7" and on "PHP 5 Coverage", which doesn't make sense.
---
 .travis.yml        | 10 +++++-----
 .travis/install.sh |  6 +++---
 composer.json      |  3 +++
 phpunit.xml        |  4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26d4173a9..44d55e44a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
+  - 5.6
+  - 5.5
 
 matrix:
   include:
@@ -13,8 +13,8 @@ matrix:
 services:
   - mongodb
 
-before_script:
-  - bash .travis/install.sh
+install:
+  - .travis/install.sh
 
 script:
-  - bash .travis/run.sh
+  - .travis/run.sh
diff --git a/.travis/install.sh b/.travis/install.sh
index b708b3888..c18376034 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 pecl install mongodb || true
-echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+#echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 git clone https://github.com/tideways/php-profiler-extension.git
 cd php-profiler-extension
@@ -11,11 +11,11 @@ if [[ "$TRAVIS_PHP_VERSION" == "5.5" ]] || [[ "$TRAVIS_PHP_VERSION" == "5.6" ]];
     echo "tideways.auto_prepend_library=0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 else
     git checkout master
-    echo "extension=tideways_xhprof.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+    echo "extension=tideways_xhprof.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 fi
 
 phpize && ./configure && make && make install && cd ..
 
 phpenv rehash
-composer install --prefer-dist --dev
+composer install --prefer-dist
 chmod -R 0777 cache/
diff --git a/composer.json b/composer.json
index 5af46fce4..82e64ac71 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,9 @@
         "phpunit/phpunit": "4.*|5.*",
         "ext-dom": "*"
     },
+    "scripts": {
+        "test": "phpunit"
+    },
     "suggest": {
         "ext-xhprof": "You need to install either xhprof or uprofiler to use XHGui.",
         "ext-uprofiler": "You need to install either xhprof or uprofiler to use XHGui.",
diff --git a/phpunit.xml b/phpunit.xml
index de079a812..7461f089a 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -3,12 +3,12 @@
     <!-- blacklist the tests and vendor directory from code coverage-->
     <filter>
         <blacklist>
-            <directory suffix=".php">./web/vendor</directory>
+            <directory suffix=".php">./vendor</directory>
         </blacklist>
     </filter>
 
     <testsuites>
-        <testsuite name="All" suffix="Test.php">
+        <testsuite>
             <directory>./tests</directory>
         </testsuite>
     </testsuites>