From 683e7da2084f06207763936429d5deb721f11f5e Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Fri, 6 Nov 2020 12:15:17 +1300 Subject: [PATCH 1/5] MNT Fix yaml config syntax --- _config/middleware.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config/middleware.yml b/_config/middleware.yml index 5cbf9ca..a6006a3 100644 --- a/_config/middleware.yml +++ b/_config/middleware.yml @@ -7,6 +7,6 @@ SilverStripe\Core\Injector\Injector: SilverStripe\Control\Director: properties: Middlewares: - SubsitesStateMiddleware: %$SilverStripe\Subsites\Middleware\InitStateMiddleware + SubsitesStateMiddleware: '%$SilverStripe\Subsites\Middleware\InitStateMiddleware' SilverStripe\Dev\Tasks\MigrateFileTask: class: SilverStripe\Subsites\Tasks\SubsiteMigrateFileTask From 017804dbd4ad7fad7dbae3e0739b40d3952e46db Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Fri, 6 Nov 2020 12:15:35 +1300 Subject: [PATCH 2/5] DEP use sminnee/phpunit:5.7 fork --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fe3c11f..f14557a 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "silverstripe/versioned": "^1.4@dev" }, "require-dev": { - "phpunit/phpunit": "^5.7", + "sminnee/phpunit": "^5.7", "squizlabs/php_codesniffer": "^3.0" }, "autoload": { From b5bd1e69b5ce8cbaf2eb2601d9bf6229f95e5938 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Fri, 6 Nov 2020 12:37:54 +1300 Subject: [PATCH 3/5] MNT Fix travis matrix --- .travis.yml | 12 +++++++----- behat.yml | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b18e5a..390581c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,17 +17,17 @@ env: matrix: include: - php: 5.6 - env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 + env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev PHPCS_TEST=1 PHPUNIT_TEST=1 - php: 7.0 - env: DB=PGSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 + env: DB=PGSQL INSTALLER_VERSION=~4.4.0@dev PHPUNIT_TEST=1 - php: 7.1 - env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev BEHAT_TEST=1 + env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev BEHAT_TEST=1 - php: 7.2 - env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 + env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev PHPUNIT_TEST=1 - php: 7.2 env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1 - php: 7.3 - env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 + env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev PHPUNIT_TEST=1 before_script: # Extra $PATH @@ -37,6 +37,8 @@ before_script: - phpenv rehash - phpenv config-rm xdebug.ini - echo 'memory_limit=3G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini + # install $COMPOSER_VERSION if defined, otherwise use Composer v1 with PHP <= 7.3, Composer v2 for >= 7.3 + - if [ $COMPOSER_VERSION ] ; then composer self-update --$COMPOSER_VERSION ; elif [ $(php -r 'echo (int) version_compare(phpversion(), "7.3.0", "<=");') = "1" ] ; then composer self-update --1; else composer self-update --2; fi # Install composer - composer validate diff --git a/behat.yml b/behat.yml index 38e7b19..0cc5f06 100644 --- a/behat.yml +++ b/behat.yml @@ -2,7 +2,7 @@ default: suites: subsites: paths: - - %paths.modules.subsites%/tests/behat/features + - '%paths.modules.subsites%/tests/behat/features' contexts: - SilverStripe\Framework\Tests\Behaviour\FeatureContext - SilverStripe\Framework\Tests\Behaviour\CmsFormsContext @@ -13,7 +13,7 @@ default: - SilverStripe\CMS\Tests\Behaviour\ThemeContext - SilverStripe\CMS\Tests\Behaviour\FixtureContext: # Note: double indent for args is intentional - - %paths.modules.subsites%/tests/behat/features/files/ + - '%paths.modules.subsites%/tests/behat/features/files/' extensions: SilverStripe\BehatExtension\MinkExtension: @@ -25,5 +25,5 @@ default: browser_name: chrome SilverStripe\BehatExtension\Extension: - screenshot_path: %paths.base%/artifacts/screenshots + screenshot_path: '%paths.base%/artifacts/screenshots' bootstrap_file: "vendor/silverstripe/cms/tests/behat/serve-bootstrap.php" From 08e5af4f2ba3d9607bb3c9d8ce7721b9a7070a68 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Fri, 6 Nov 2020 15:11:15 +1300 Subject: [PATCH 4/5] MNT use shared travis config --- .travis.yml | 66 ++++------------------------------------------------- 1 file changed, 5 insertions(+), 61 deletions(-) diff --git a/.travis.yml b/.travis.yml index 390581c..dd382f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,66 +1,10 @@ -language: php +# https://docs.travis-ci.com/user/build-config-imports/ +version: ~> 1.0 -dist: trusty - -before_install: - - sudo apt-get update - - sudo apt-get install chromium-chromedriver +import: + - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-behat.yml env: global: - COMPOSER_ROOT_VERSION="2.3.x-dev" - - DISPLAY=":99" - - XVFBARGS=":99 -ac -screen 0 1024x768x16" - - SS_BASE_URL="http://localhost:8080/" - - SS_ENVIRONMENT_TYPE="dev" - -matrix: - include: - - php: 5.6 - env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev PHPCS_TEST=1 PHPUNIT_TEST=1 - - php: 7.0 - env: DB=PGSQL INSTALLER_VERSION=~4.4.0@dev PHPUNIT_TEST=1 - - php: 7.1 - env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev BEHAT_TEST=1 - - php: 7.2 - env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev PHPUNIT_TEST=1 - - php: 7.2 - env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1 - - php: 7.3 - env: DB=MYSQL INSTALLER_VERSION=~4.4.0@dev PHPUNIT_TEST=1 - -before_script: - # Extra $PATH - - export PATH=/usr/lib/chromium-browser/:$PATH - - # Init PHP - - phpenv rehash - - phpenv config-rm xdebug.ini - - echo 'memory_limit=3G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - # install $COMPOSER_VERSION if defined, otherwise use Composer v1 with PHP <= 7.3, Composer v2 for >= 7.3 - - if [ $COMPOSER_VERSION ] ; then composer self-update --$COMPOSER_VERSION ; elif [ $(php -r 'echo (int) version_compare(phpversion(), "7.3.0", "<=");') = "1" ] ; then composer self-update --1; else composer self-update --2; fi - - # Install composer - - composer validate - - composer require silverstripe/installer:"$INSTALLER_VERSION" silverstripe/recipe-testing:^1 --no-update - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi - - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - - # Behat bootstrapping - - if [[ $BEHAT_TEST ]]; then mkdir artifacts; fi - - if [[ $BEHAT_TEST ]]; then cp composer.lock artifacts/; fi - - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi - - if [[ $BEHAT_TEST ]]; then (chromedriver > artifacts/chromedriver.log 2>&1 &); fi - - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi - -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 src tests *.php --ignore=host-map.php; fi - - if [[ $BEHAT_TEST ]]; then vendor/bin/behat @subsites; fi - -after_success: - - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi - -after_failure: - - if [[ $BEHAT_TEST ]]; then php ./vendor/silverstripe/framework/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/ --artifacts-path ./artifacts/; fi + - BEHAT_SUITE="@subsites" From 3fb2e9a1e0260cd1bc9c06384602a2c12edb2d12 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Fri, 6 Nov 2020 16:19:08 +1300 Subject: [PATCH 5/5] MNT Define phpcs paths --- .travis.yml | 3 +-- phpcs.xml.dist | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd382f0..4b8e87d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ -# https://docs.travis-ci.com/user/build-config-imports/ version: ~> 1.0 import: - - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-behat.yml + - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-behat.yml env: global: diff --git a/phpcs.xml.dist b/phpcs.xml.dist index b8f7d59..86b1ca4 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,6 +2,9 @@ CodeSniffer ruleset for SilverStripe coding conventions. + src + tests +