From e6fde04bc31fde895c7899f85dde05bd3c101053 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Tue, 27 Nov 2018 11:01:19 +0100
Subject: [PATCH] ci: Update travis matrix and vendor test helpers

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

diff --git a/.travis.yml b/.travis.yml
index a32a7ab9..aa02ab53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ php:
   - '7.0'
   - '7.1'
   - '7.2'
+  - '7.3'
   - nightly
 
 services:
@@ -27,6 +28,7 @@ matrix:
       php: '5.4'
   allow_failures:
     - php: nightly
+    - php: '7.3'
 
 env:
   - CHECK=phpunit DB=mysql DIRECTOR_TESTDB_RES="Director MySQL TestDB" DIRECTOR_TESTDB="director_test"
diff --git a/test/setup_vendor.sh b/test/setup_vendor.sh
index 2aa37c23..2f18b837 100755
--- a/test/setup_vendor.sh
+++ b/test/setup_vendor.sh
@@ -2,13 +2,13 @@
 
 set -ex
 
-MODULE_HOME=${MODULE_HOME:="$(dirname "$(readlink -f $(dirname "$0"))")"}
+MODULE_HOME=${MODULE_HOME:="$(dirname "$(readlink -f "$(dirname "$0")")")"}
 PHP_VERSION="$(php -r 'echo phpversion();')"
 
-ICINGAWEB_VERSION=${ICINGAWEB_VERSION:=2.5.0}
+ICINGAWEB_VERSION=${ICINGAWEB_VERSION:=2.6.2}
 ICINGAWEB_GITREF=${ICINGAWEB_GITREF:=}
 
-PHPCS_VERSION=${PHPCS_VERSION:=2.9.1}
+PHPCS_VERSION=${PHPCS_VERSION:=3.3.2}
 
 if [ "$PHP_VERSION" '<' 5.6.0 ]; then
   PHPUNIT_VERSION=${PHPUNIT_VERSION:=4.8}
@@ -16,7 +16,7 @@ else
   PHPUNIT_VERSION=${PHPUNIT_VERSION:=5.7}
 fi
 
-cd ${MODULE_HOME}
+cd "${MODULE_HOME}"
 
 test -d vendor || mkdir vendor
 cd vendor/
@@ -48,8 +48,8 @@ else
   rm -f icingaweb2
   ln -svf "${icingaweb_path}" icingaweb2
 fi
-ln -svf "${icingaweb_path}"/library/Icinga
-ln -svf "${icingaweb_path}"/library/vendor/Zend
+ln -svf "${icingaweb_path}"/library/Icinga Icinga
+ln -svf "${icingaweb_path}"/library/vendor/Zend Zend
 
 # phpunit
 phpunit_path="phpunit-${PHPUNIT_VERSION}"