tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-30 17:24:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1720 from Icinga/travis

Browse Source 
ci: Update travis matrix and vendor test helpers
This commit is contained in:
Markus Frosch 2018-12-03 11:02:28 +01:00 committed by GitHub
commit 8f09afd31b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -6,6 +6,7 @@ php:
- '7.0' - '7.0'
- '7.1' - '7.1'
- '7.2' - '7.2'
- '7.3'
- nightly - nightly
services: services:
@ -27,6 +28,7 @@ matrix:
php: '5.4' php: '5.4'
allow_failures: allow_failures:
- php: nightly - php: nightly
- php: '7.3'
env: env:
- CHECK=phpunit DB=mysql DIRECTOR_TESTDB_RES="Director MySQL TestDB" DIRECTOR_TESTDB="director_test" - CHECK=phpunit DB=mysql DIRECTOR_TESTDB_RES="Director MySQL TestDB" DIRECTOR_TESTDB="director_test"

4
application/controllers/DataController.php
View File

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

34
library/Director/Web/Controller/ObjectsController.php
View File

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

12
test/setup_vendor.sh
View File

@ -2,13 +2,13 @@
set -ex 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();')" PHP_VERSION="$(php -r 'echo phpversion();')"
ICINGAWEB_VERSION=${ICINGAWEB_VERSION:=2.5.0} ICINGAWEB_VERSION=${ICINGAWEB_VERSION:=2.6.2}
ICINGAWEB_GITREF=${ICINGAWEB_GITREF:=} 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 if [ "$PHP_VERSION" '<' 5.6.0 ]; then
PHPUNIT_VERSION=${PHPUNIT_VERSION:=4.8} PHPUNIT_VERSION=${PHPUNIT_VERSION:=4.8}
@ -16,7 +16,7 @@ else
PHPUNIT_VERSION=${PHPUNIT_VERSION:=5.7} PHPUNIT_VERSION=${PHPUNIT_VERSION:=5.7}
fi fi
cd ${MODULE_HOME} cd "${MODULE_HOME}"
test -d vendor || mkdir vendor test -d vendor || mkdir vendor
cd vendor/ cd vendor/
@ -48,8 +48,8 @@ else
rm -f icingaweb2 rm -f icingaweb2
ln -svf "${icingaweb_path}" icingaweb2 ln -svf "${icingaweb_path}" icingaweb2
fi fi
ln -svf "${icingaweb_path}"/library/Icinga ln -svf "${icingaweb_path}"/library/Icinga Icinga
ln -svf "${icingaweb_path}"/library/vendor/Zend ln -svf "${icingaweb_path}"/library/vendor/Zend Zend
# phpunit # phpunit
phpunit_path="phpunit-${PHPUNIT_VERSION}" phpunit_path="phpunit-${PHPUNIT_VERSION}"