From 956bd9d9a4cd0b9b24c3666d1412972c2d298f17 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 18 Aug 2018 00:19:48 +1200 Subject: [PATCH 1/3] Bump recipe-cms to 4.3.x-dev and postgres to 2.1.x-dev --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3867b39..5f40b15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ before_script: - phpenv config-rm xdebug.ini - composer validate - - composer require --prefer-dist --no-update silverstripe/recipe-cms:1.0.x-dev - - if [[ $DB == PGSQL ]]; then composer require --prefer-dist --no-update silverstripe/postgresql:2.0.x-dev; fi + - composer require --prefer-dist --no-update silverstripe/recipe-cms:4.3.x-dev + - if [[ $DB == PGSQL ]]; then composer require --prefer-dist --no-update silverstripe/postgresql:2.1.x-dev; fi - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile # Install NPM dependencies From 2fd78f10a9363b32efb60a48934ed33db4ecab9c Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 18 Aug 2018 10:09:56 +1200 Subject: [PATCH 2/3] Add individual phpcs ruleset to Travis builds --- .travis.yml | 2 +- phpcs.xml.dist | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 phpcs.xml.dist diff --git a/.travis.yml b/.travis.yml index 5f40b15..0d55b4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ before_script: script: - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi - - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist src/ tests/; fi + - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ *.php; fi - if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi - if [[ $NPM_TEST ]]; then git diff --name-status --relative=client; fi - if [[ $NPM_TEST ]]; then yarn run test; fi diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 0000000..6e383f9 --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,11 @@ + + + CodeSniffer ruleset for SilverStripe coding conventions. + + + + + + + + From 7f5b1ebcedf70038ad9b3ab7cbfbc0c8f9317f20 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 18 Aug 2018 10:12:51 +1200 Subject: [PATCH 3/3] Require source and specify admin version in Travis config --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d55b4f..d7642da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,9 +23,9 @@ before_script: - phpenv config-rm xdebug.ini - composer validate - - composer require --prefer-dist --no-update silverstripe/recipe-cms:4.3.x-dev - - if [[ $DB == PGSQL ]]; then composer require --prefer-dist --no-update silverstripe/postgresql:2.1.x-dev; fi - - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile + - composer require --no-update silverstripe/recipe-cms:4.3.x-dev silverstripe/admin:1.3.x-dev + - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi + - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile # Install NPM dependencies - if [[ $NPM_TEST ]]; then nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION && npm install -g yarn && yarn install --network-concurrency 1 && (cd vendor/silverstripe/admin && yarn install --network-concurrency 1) && yarn run build; fi