From a273c204904ed18ccf05fc376d31be03f6db7487 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 8 May 2016 15:30:33 +0200
Subject: [PATCH] Travis: Prevent PHP53 to run API tests.

---
 .travis.yml | 19 +++++++++++++++++--
 Makefile    |  2 +-
 phpunit.xml |  6 ++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95439bd6c..a643ce80e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ php:
   - 5.6
   - 5.5
   - 5.4
-#  - 5.3 doesn't provide a 'php' webserver as required in tests/api/run.sh
+  - 5.3 # doesn't provide a 'php' webserver as required in tests/api/run.sh
 install:
   - composer self-update
   - composer install
@@ -13,8 +13,23 @@ addons:
   apt:
     packages:
     - xsltproc
+env:
+  - HTTPTEST=1
+  - HTTPTEST=0
+matrix:
+  exclude:
+    - php: 5.3
+      env: HTTPTEST=1
+    - php: 5.4
+      env: HTTPTEST=0
+    - php: 5.5
+      env: HTTPTEST=0
+    - php: 5.6
+      env: HTTPTEST=0
+    - php: 7.0
+      env: HTTPTEST=0
 script:
   - make clean
   - make check_permissions
   - make test
-  - sh tests/api/run.sh
+  - if [[ $HTTPTEST == 1 ]]; then sh tests/api/run.sh; fi
diff --git a/Makefile b/Makefile
index 75c54f287..5e0f939ca 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ test:
 	@echo "PHPUNIT"
 	@echo "-------"
 	@mkdir -p sandbox
-	@$(BIN)/phpunit tests
+	@$(BIN)/phpunit --configuration phpunit.xml
 
 ##
 # Targets for repository and documentation maintenance
diff --git a/phpunit.xml b/phpunit.xml
index d6e01c357..03129081c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -3,6 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
     colors="true">
+  <testsuites>
+    <testsuite name="unit-tests">
+      <directory>tests</directory>
+      <exclude>tests/api</exclude>
+    </testsuite>
+  </testsuites>
   <filter>
     <whitelist addUncoveredFilesFromWhitelist="true">
       <directory suffix=".php">application</directory>