From 2e80ba2390df07c36192005f7c919091fbb4a284 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Mon, 11 Dec 2017 10:10:41 +0100
Subject: [PATCH] travis: Update icingaweb2 version and testing

---
 .travis.yml          | 2 +-
 test/setup_vendor.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 758abf48..dd882516 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,4 +31,4 @@ before_script:
 
 script:
   - php vendor/phpcs.phar
-  - php vendor/phpunit.phar --testdox || phpunit --verbose
+  - php vendor/phpunit.phar --testdox || php vendor/phpunit.phar --verbose
diff --git a/test/setup_vendor.sh b/test/setup_vendor.sh
index f2be6027..2aa37c23 100755
--- a/test/setup_vendor.sh
+++ b/test/setup_vendor.sh
@@ -5,7 +5,7 @@ set -ex
 MODULE_HOME=${MODULE_HOME:="$(dirname "$(readlink -f $(dirname "$0"))")"}
 PHP_VERSION="$(php -r 'echo phpversion();')"
 
-ICINGAWEB_VERSION=${ICINGAWEB_VERSION:=2.4.1}
+ICINGAWEB_VERSION=${ICINGAWEB_VERSION:=2.5.0}
 ICINGAWEB_GITREF=${ICINGAWEB_GITREF:=}
 
 PHPCS_VERSION=${PHPCS_VERSION:=2.9.1}
@@ -45,6 +45,7 @@ else
     tar xf "${icingaweb_path}".tar.gz
   fi
 
+  rm -f icingaweb2
   ln -svf "${icingaweb_path}" icingaweb2
 fi
 ln -svf "${icingaweb_path}"/library/Icinga