Merge pull request #1720 from Icinga/travis

ci: Update travis matrix and vendor test helpers

.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"

application/controllers/DataController.php

@@ -22,8 +22,8 @@ class DataController extends ActionController
             Link::create($this->translate('Add'), 'director/data/list', null, [
                 'class' => 'icon-plus',
                 'data-base-target' => '_next'
-            ]
-        ));
+            ])
+        );
 
         $this->tabs(new DataTabs())->activate('datalist');
         (new DatalistTable($this->db()))->renderTo($this);

library/Director/Web/Controller/ObjectsController.php

@@ -240,23 +240,23 @@ abstract class ObjectsController extends ActionController
                 $this->translate('All your %s Apply Rules'),
                 $tType
             );
-        $this->actions()/*->add(
-            $this->getBackToDashboardLink()
-        )*/->add(
-            Link::create(
-                $this->translate('Add'),
-                "director/$type/add",
-                ['type' => 'apply'],
-                [
-                    'title' => sprintf(
-                        $this->translate('Create a new %s Apply Rule'),
-                        $tType
-                    ),
-                    'class' => 'icon-plus',
-                    'data-base-target' => '_next'
-                ]
-            )
-        );
+        $this->actions()
+            //->add($this->getBackToDashboardLink())
+            ->add(
+                Link::create(
+                    $this->translate('Add'),
+                    "director/$type/add",
+                    ['type' => 'apply'],
+                    [
+                        'title' => sprintf(
+                            $this->translate('Create a new %s Apply Rule'),
+                            $tType
+                        ),
+                        'class' => 'icon-plus',
+                        'data-base-target' => '_next'
+                    ]
+                )
+            );
 
         $table = new ApplyRulesTable($this->db());
         $table->setType($this->getType());

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}"