diff --git a/.travis.yml b/.travis.yml index 4e18a3b..74cc970 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,25 +2,25 @@ language: php env: global: - - COMPOSER_ROOT_VERSION="4.0.x-dev" + - COMPOSER_ROOT_VERSION="3.1.x-dev" matrix: include: - php: 5.6 - env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1 + env: DB=MYSQL RECIPE_VERSION=1.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 - php: 7.0 - env: DB=PGSQL PHPUNIT_TEST=1 + env: DB=PGSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1 - php: 7.1 - env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 + env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1 - php: 7.2 - env: DB=MYSQL PHPUNIT_TEST=1 + env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 before_script: - phpenv rehash - phpenv config-rm xdebug.ini - composer validate - - composer require silverstripe/recipe-core 1.0.x-dev --no-update + - composer require silverstripe/recipe-core "$RECIPE_VERSION" --no-update - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --no-update; fi - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile diff --git a/templates/Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss b/templates/Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss index c63a65a..40f70de 100644 --- a/templates/Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss +++ b/templates/Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss @@ -1,3 +1,3 @@ - diff --git a/tests/GridFieldOrderableRowsTest.php b/tests/GridFieldOrderableRowsTest.php index 024e791..2ca98a9 100644 --- a/tests/GridFieldOrderableRowsTest.php +++ b/tests/GridFieldOrderableRowsTest.php @@ -23,17 +23,11 @@ use Symbiote\GridFieldExtensions\Tests\Stub\ThroughBelongs; */ class GridFieldOrderableRowsTest extends SapphireTest { - /** - * @var string - */ protected static $fixture_file = [ 'GridFieldOrderableRowsTest.yml', 'OrderableRowsThroughTest.yml' ]; - /** - * @var array - */ protected static $extra_dataobjects = [ StubParent::class, StubOrdered::class,