tonyair
/
silverstripe-blog
mirror of https://github.com/silverstripe/silverstripe-blog
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.5' into 3

This commit is contained in:
Maxime Rainville 2020-10-22 22:51:02 +13:00
parent fc51e77af3 053660e795
commit 5b14e0b1bd
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.travis.yml
View File

@ -1,21 +1,27 @@
sudo: false
dist: trusty
language: php language: php
dist: xenial
services:
- mysql
- postgresql
cache:
directories:
- $HOME/.composer/cache/files
matrix: matrix:
include: include:
- php: 5.6 - php: 5.6
env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
- php: 7.0
env: DB=PGSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1
- php: 7.1 - php: 7.1
env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1 env: DB=MYSQL INSTALLER_VERSION=4.5.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.2 - php: 7.2
env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 env: DB=PGSQL INSTALLER_VERSION=4.6.x-dev PHPUNIT_TEST=1 NPM_TEST=1
- php: 7.3 - php: 7.3
env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1 NPM_TEST=1 env: DB=MYSQL INSTALLER_VERSION=4.6.x-dev PHPUNIT_TEST=1
- php: 7.4
env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1
before_script: before_script:
# Init PHP # Init PHP
@ -25,8 +31,10 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer validate - composer validate
- composer require --no-update silverstripe/installer:$INSTALLER_VERSION silverstripe/widgets:2.x-dev - composer require --no-update silverstripe/installer:$INSTALLER_VERSION silverstripe/widgets:^2
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
# Fix for running phpunit 5 on php 7.4+
- composer require --no-update sminnee/phpunit-mock-objects:^3
- 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
- if [[ $NPM_TEST ]]; then nvm install && nvm use && npm install -g yarn && yarn install --network-concurrency 1 && (cd vendor/silverstripe/admin && yarn install --network-concurrency 1) && yarn run build; fi - if [[ $NPM_TEST ]]; then nvm install && nvm use && npm install -g yarn && yarn install --network-concurrency 1 && (cd vendor/silverstripe/admin && yarn install --network-concurrency 1) && yarn run build; fi

14
templates/SilverStripe/Blog/Forms/GridField/GridFieldAddByDBField.ss
View File

@ -1,5 +1,13 @@
<div class="add-existing-autocompleter"> <div class="add-existing-autocompleter">
<% loop $Fields %> <div class="input-group">
<span>$Field</span> <% loop $Fields %>
<% end_loop %> <% if $Type == 'action' %>
<div class="input-group-append">
$Field
</div>
<% else %>
$Field
<% end_if %>
<% end_loop %>
</div>
</div> </div>