tonyair/silverstripe-gridfieldextensions
1
0
Fork 0
mirror of https://github.com/symbiote/silverstripe-gridfieldextensions.git synced 2024-10-22 17:05:39 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3' into 'master'

Browse Source
This commit is contained in:
Dylan Wagstaff 2018-07-02 11:35:52 +12:00
commit 7355a4a816
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -2,25 +2,25 @@ language: php
env: env:
global: global:
- COMPOSER_ROOT_VERSION="4.0.x-dev" - COMPOSER_ROOT_VERSION="3.1.x-dev"
matrix: matrix:
include: include:
- php: 5.6 - 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 - php: 7.0
env: DB=PGSQL PHPUNIT_TEST=1 env: DB=PGSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
- php: 7.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 - php: 7.2
env: DB=MYSQL PHPUNIT_TEST=1 env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
before_script: before_script:
- phpenv rehash - phpenv rehash
- phpenv config-rm xdebug.ini - phpenv config-rm xdebug.ini
- composer validate - 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 - 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 - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

2
templates/Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss
View File

@ -1,3 +1,3 @@
<button href="$Link" class="ss-gridfield-add-new-inline btn btn-primary" data-icon="add"> <button href="$Link" class="ss-gridfield-add-new-inline btn btn-primary font-icon-plus-circled">
$Title $Title
</button> </button>

6
tests/GridFieldOrderableRowsTest.php
View File

@ -23,17 +23,11 @@ use Symbiote\GridFieldExtensions\Tests\Stub\ThroughBelongs;
*/ */
class GridFieldOrderableRowsTest extends SapphireTest class GridFieldOrderableRowsTest extends SapphireTest
{ {
/**
* @var string
*/
protected static $fixture_file = [ protected static $fixture_file = [
'GridFieldOrderableRowsTest.yml', 'GridFieldOrderableRowsTest.yml',
'OrderableRowsThroughTest.yml' 'OrderableRowsThroughTest.yml'
]; ];
/**
* @var array
*/
protected static $extra_dataobjects = [ protected static $extra_dataobjects = [
StubParent::class, StubParent::class,
StubOrdered::class, StubOrdered::class,