From e279f35abf495f995191bd93efd0d449104a1e51 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Fri, 1 Feb 2019 16:05:37 +1300 Subject: [PATCH 1/4] TravisCI / fix silverstripe/posgresql version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6c05a9..7a6fc4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,7 @@ before_script: # Install composer dependencies - composer validate - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi + - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^1; fi; - if [[ $HEALTH_TEST ]]; then composer require --no-update silverstripe/serve:^2; fi; - if ! [[ $HEALTH_TEST ]]; then composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi; From c8451b90717419a0f57156cb6a4012dab4de8da4 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Sat, 2 Feb 2019 11:22:56 +0300 Subject: [PATCH 2/4] Split framework tests from assets and versioned to prevent time limits being exceeded Also removed an unneeded editorconfig block which is duplicated and adds PHP 7.2 and 7.3 into the builds --- .editorconfig | 4 ---- .travis.yml | 10 +++++++--- phpunit.xml.dist | 42 ++++++++++++++++++++---------------------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/.editorconfig b/.editorconfig index 9f76bfa..dbb25c6 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,10 +15,6 @@ trim_trailing_whitespace = true [*.md] trim_trailing_whitespace = false -[*.yml] -indent_size = 2 -indent_style = space - [*.{yml,json}] # The indent size used in the `package.json` file cannot be changed # https://github.com/npm/npm/pull/3180#issuecomment-16336516 diff --git a/.travis.yml b/.travis.yml index 473319d..bc53bbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,16 +33,20 @@ matrix: - PHPUNIT_TEST=core - DB=MYSQL - PDO=1 - - php: 7.1.2 + - php: 7.1 + env: + - PHPUNIT_TEST=framework + - DB=MYSQL + - php: 7.3 env: - PHPUNIT_TEST=core - DB=PGSQL # admin php tests - - php: 5.6 + - php: 7.0 env: - PHPUNIT_TEST=admin - DB=PGSQL - - php: 7.1.2 + - php: 7.2 env: - PHPUNIT_TEST=admin - DB=MYSQL diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a629724..7a62210 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -4,11 +4,12 @@ Requires PHPUnit 5+ Usage: - - "phpunit": Runs all tests in all folders - - "phpunit framework/tests/": Run all tests of the framework module - - "phpunit framework/tests/filesystem": Run all filesystem tests within the framework module - - "phpunit framework/tests/filesystem/FolderTest.php": Run a single test - - "phpunit coverage-html assets/": Generate coverage report (replace with "-", requires xdebug) + - "vendor/bin/phpunit": Runs all tests in all folders + - "vendor/bin/phpunit vendor/silverstripe/framework/tests/": Run all tests of the framework module + - "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem": Run all filesystem tests within framework + - "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem/FolderTest.php": Run a single test + - "vendor/bin/phpunit coverage-html assets/": Generate coverage report (replace + with "-", requires xdebug or phpdbg) More information: - http://www.phpunit.de/manual/current/en/textui.html @@ -17,34 +18,31 @@ It is safe to remove this file for normal website operation. --> + + mysite/tests + vendor/silverstripe/cms/tests/php + vendor/silverstripe/framework/tests/php + - - mysite/tests - vendor/silverstripe/cms/tests/php - vendor/silverstripe/framework/tests/php - + + + vendor/silverstripe/framework/tests/php/ + - + - vendor/silverstripe/framework/tests/php/ - vendor/silverstripe/assets/tests/php/ + vendor/silverstripe/assets/tests/php/ vendor/silverstripe/versioned/tests/php/ - vendor/silverstripe/cms/tests/ vendor/silverstripe/admin/tests/php/ - vendor/silverstripe/campaign-admin/tests/php/ vendor/silverstripe/asset-admin/tests/php/ + vendor/silverstripe/campaign-admin/tests/php/ + vendor/silverstripe/cms/tests/ vendor/silverstripe/graphql/tests/ - vendor/silverstripe/siteconfig/tests/php/ vendor/silverstripe/reports/tests/ + vendor/silverstripe/siteconfig/tests/php/ - - - - sanitychecks - - From 1a55336552cc36ef2f2a4145e36a7eddb687419b Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Tue, 19 Feb 2019 10:53:35 +1300 Subject: [PATCH 3/4] Update development dependencies --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 93893ff..af509a7 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "require": { "php": ">=5.6.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "4.2.x-dev", + "silverstripe/recipe-cms": "4.2.4@stable", "silverstripe-themes/simple": "~3.2.0" }, "require-dev": { From 1b31ffa28a7e72c4c943b1d53ac2b156e899119b Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 19 Feb 2019 05:25:35 +0700 Subject: [PATCH 4/4] Revert "Update development dependencies" This reverts commit 1a55336552cc36ef2f2a4145e36a7eddb687419b. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index af509a7..93893ff 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "require": { "php": ">=5.6.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "4.2.4@stable", + "silverstripe/recipe-cms": "4.2.x-dev", "silverstripe-themes/simple": "~3.2.0" }, "require-dev": {