From 97d0fc61d8a8d246ae2fa05ad769fdb741a3c8ea Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Mon, 28 Nov 2016 18:44:19 +1300 Subject: [PATCH] API Include psr-2 checks in CI --- .editorconfig | 2 +- .travis.yml | 63 +++++++++++++++++++++-------------------- composer.json | 3 ++ tests/phpcs/ruleset.xml | 41 ++++++++++++--------------- tests/phpcs/tabs.xml | 26 ----------------- 5 files changed, 55 insertions(+), 80 deletions(-) delete mode 100644 tests/phpcs/tabs.xml diff --git a/.editorconfig b/.editorconfig index bdcec0f9492..b986ce55f59 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,7 @@ charset = utf-8 end_of_line = lf indent_size = 4 -indent_style = tab +indent_style = space insert_final_newline = true trim_trailing_whitespace = true diff --git a/.travis.yml b/.travis.yml index fec1e51fb24..4cb718afc77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - php: 5.5 env: DB=PGSQL PHPUNIT_TEST=1 - php: 5.6 - env: DB=MYSQL PHPUNIT_TEST=1 + env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1 - php: 7.0 env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1 - php: 5.6 @@ -34,38 +34,41 @@ matrix: env: DB=MYSQL CMS_TEST=1 BEHAT_TEST=1 before_script: - - export CORE_RELEASE=$TRAVIS_BRANCH - - printf "\n" | pecl install imagick - - composer self-update || true - - phpenv rehash - - phpenv config-rm xdebug.ini - - "export DISPLAY=\":99\"" - - "export XVFBARGS=\":99 -ac -screen 0 1024x768x16\"" - - "export COMPOSER_ROOT_VERSION=4.0.x-dev" - - "if [ \"$na\" = \"\" ]; then composer install --prefer-dist; fi" - - "if [ \"$DB\" = \"PGSQL\" ]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi" - - "if [ \"$DB\" = \"SQLITE\" ]; then composer require silverstripe/sqlite3:2.0.x-dev --prefer-dist; fi" - - "if [ \"$CMS_TEST\" = \"1\" ]; then COMPOSER_ROOT_VERSION=4.0.x-dev composer require silverstripe/cms:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/reports:4.0.x-dev --prefer-dist; fi" - - "if [ \"$CMS_TEST\" = \"1\" ]; then php ./cms/tests/bootstrap/mysite.php; fi" - - "if [ \"$NPM_TEST\" = \"1\" ] && [ `git log --format=format:%aE -1` = \"support@greenkeeper.io\" ]; then echo \"Removing npm-shrinkwrap.json\"; rm npm-shrinkwrap.json; fi" - - "if [ \"$NPM_TEST\" = \"1\" ]; then nvm install $TRAVIS_NODE_VERSION && npm install; fi" - - "if [ \"$BEHAT_TEST\" = \"1\" ]; then sh -e /etc/init.d/xvfb start; sleep 3; fi" - - "if [ \"$BEHAT_TEST\" = \"1\" ]; then (vendor/bin/selenium-server-standalone > selenium.log 2>&1 &); fi" - - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then (vendor/bin/serve --bootstrap-file tests/behat/serve-bootstrap.php &> serve.log &); fi" - - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"1\" ]; then (vendor/bin/serve --bootstrap-file cms/tests/behat/serve-bootstrap.php &> serve.log &); fi" + - export CORE_RELEASE=$TRAVIS_BRANCH + - printf "\n" | pecl install imagick + - composer self-update || true + - "if [ \"$PHPCS_TEST\" = \"1\" ]; then pyrus install pear/PHP_CodeSniffer; fi" + - phpenv rehash + - phpenv config-rm xdebug.ini + - "export DISPLAY=\":99\"" + - "export XVFBARGS=\":99 -ac -screen 0 1024x768x16\"" + - "export COMPOSER_ROOT_VERSION=4.0.x-dev" + - "if [ \"$na\" = \"\" ]; then composer install --prefer-dist; fi" + - "if [ \"$DB\" = \"PGSQL\" ]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi" + - "if [ \"$DB\" = \"SQLITE\" ]; then composer require silverstripe/sqlite3:2.0.x-dev --prefer-dist; fi" + - "if [ \"$CMS_TEST\" = \"1\" ]; then COMPOSER_ROOT_VERSION=4.0.x-dev composer require silverstripe/cms:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/reports:4.0.x-dev --prefer-dist; fi" + - "if [ \"$CMS_TEST\" = \"1\" ]; then php ./cms/tests/bootstrap/mysite.php; fi" + - "if [ \"$NPM_TEST\" = \"1\" ] && [ `git log --format=format:%aE -1` = \"support@greenkeeper.io\" ]; then echo \"Removing npm-shrinkwrap.json\"; rm npm-shrinkwrap.json; fi" + - "if [ \"$NPM_TEST\" = \"1\" ]; then nvm install $TRAVIS_NODE_VERSION && npm install; fi" + - "if [ \"$BEHAT_TEST\" = \"1\" ]; then sh -e /etc/init.d/xvfb start; sleep 3; fi" + - "if [ \"$BEHAT_TEST\" = \"1\" ]; then (vendor/bin/selenium-server-standalone > selenium.log 2>&1 &); fi" + - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then (vendor/bin/serve --bootstrap-file tests/behat/serve-bootstrap.php &> serve.log &); fi" + - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"1\" ]; then (vendor/bin/serve --bootstrap-file cms/tests/behat/serve-bootstrap.php &> serve.log &); fi" + script: - - "if [ \"$PHPUNIT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then vendor/bin/phpunit; fi" - - "if [ \"$PHPUNIT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"1\" ]; then vendor/bin/phpunit cms/tests; fi" - - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then vendor/bin/behat --config tests/behat/config.yml .; fi" - - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"1\" ]; then vendor/bin/behat @cms --config tests/behat/cms-config.yml; fi" - - "if [ \"$NPM_TEST\" = \"1\" ]; then npm run test; fi" - - "if [ \"$NPM_TEST\" = \"1\" ]; then npm run lint; fi" - - "if [ \"$NPM_TEST\" = \"1\" ]; then npm run build; fi" - - "if [ \"$PHPUNIT_COVERAGE_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then phpdbg -qrr ./vendor/bin/phpunit --coverage-clover=coverage.xml; fi" - - "if [ \"$PHPUNIT_COVERAGE_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi" + - "if [ \"$PHPUNIT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then vendor/bin/phpunit; fi" + - "if [ \"$PHPUNIT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"1\" ]; then vendor/bin/phpunit cms/tests; fi" + - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then vendor/bin/behat --config tests/behat/config.yml .; fi" + - "if [ \"$BEHAT_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"1\" ]; then vendor/bin/behat @cms --config tests/behat/cms-config.yml; fi" + - "if [ \"$NPM_TEST\" = \"1\" ]; then npm run test; fi" + - "if [ \"$NPM_TEST\" = \"1\" ]; then npm run lint; fi" + - "if [ \"$NPM_TEST\" = \"1\" ]; then npm run build; fi" + - "if [ \"$PHPUNIT_COVERAGE_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then phpdbg -qrr ./vendor/bin/phpunit --coverage-clover=coverage.xml; fi" + - "if [ \"$PHPUNIT_COVERAGE_TEST\" = \"1\" ] && [ \"$CMS_TEST\" = \"\" ]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi" + - "if [ \"$PHPCS_TEST\" = \"1\" ]; then composer run-script lint; fi" after_failure: - - php ./tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ + - php ./tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ branches: except: diff --git a/composer.json b/composer.json index 356c5106c35..57542aff925 100644 --- a/composer.json +++ b/composer.json @@ -66,6 +66,9 @@ "src/", "thirdparty/" ], + "scripts": { + "lint": "phpcs --standard=tests/phpcs/ruleset.xml src/" + }, "min-stability": "dev", "prefer-stable": true } diff --git a/tests/phpcs/ruleset.xml b/tests/phpcs/ruleset.xml index dc332ade795..a681333cfe1 100644 --- a/tests/phpcs/ruleset.xml +++ b/tests/phpcs/ruleset.xml @@ -1,30 +1,25 @@ CodeSniffer ruleset for SilverStripe coding conventions. - - - */css/* - css/* - - - thirdparty/* - */jquery-changetracker/* - parsers/HTML/BBCodeParser/* - + + + + + + + + + + + + + + + + + + */SSTemplateParser.php$ - - - 7 - - - 8 - - - - - - - diff --git a/tests/phpcs/tabs.xml b/tests/phpcs/tabs.xml deleted file mode 100644 index c6a996e8627..00000000000 --- a/tests/phpcs/tabs.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - CodeSniffer ruleset for SilverStripe indentation conventions. - - - */css/* - css/* - - - thirdparty/* - */jquery-changetracker/* - parsers/HTML/BBCodeParser/* - - - */SSTemplateParser.php$ - - - 8 - - - - - - - -