Merge pull request #216 from creative-commoners/pulls/5.0/phpunit7

API Increase minimum PHP version to 7.1, include PHPUnit 7
This commit is contained in:
Damian Mooyman 2018-01-18 15:13:58 +13:00 committed by GitHub
commit 24fdd54e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 42 deletions

View File

@ -27,7 +27,7 @@ matrix:
fast_finish: true
include:
# Core php tests
- php: 5.6
- php: 7.2
env:
- PHPUNIT_TEST=core
- DB=MYSQL
@ -37,7 +37,7 @@ matrix:
- PHPUNIT_TEST=core
- DB=PGSQL
# admin php tests
- php: 5.6
- php: 7.2
env:
- PHPUNIT_TEST=admin
- DB=PGSQL
@ -47,15 +47,15 @@ matrix:
- DB=MYSQL
- PDO=1
# behat tests
- php: 7.0
- php: 7.1
env:
- BEHAT_TEST="@framework"
- DB=MYSQL
- php: 7.0
- php: 7.1
env:
- BEHAT_TEST="@cms"
- DB=MYSQL
- php: 7.0
- php: 7.1
env:
- BEHAT_TEST="@asset-admin"
- DB=MYSQL
@ -68,8 +68,8 @@ before_script:
# Install composer dependencies
- composer validate
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi
- if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/behat-extension:^3 silverstripe/serve:^2 se/selenium-server-standalone:2.41.0; fi;
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:3.x-dev; fi
- if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/behat-extension:^4 silverstripe/serve:^3 se/selenium-server-standalone:2.41.0; fi;
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
# Start behat services

View File

@ -3,13 +3,13 @@
"type": "silverstripe-recipe",
"description": "The SilverStripe Framework Installer",
"require": {
"php": ">=5.6.0",
"php": ">=7.1.0",
"silverstripe/recipe-plugin": "^1",
"silverstripe/recipe-cms": "2.x-dev",
"silverstripe-themes/simple": "~3.2.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7"
"phpunit/phpunit": "^7@dev"
},
"extra": {
"project-files": [

View File

@ -1,14 +1,15 @@
<!--
PHPUnit configuration for SilverStripe
Requires PHPUnit 5+
Requires PHPUnit 7+
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 <dash><dash>coverage-html assets/": Generate coverage report (replace <dash> 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 <dash><dash>group admin": Run all tests within the core test group
(replace <dash> with "-", requires xdebug)
- "vendor/bin/phpunit <dash><dash>filter FolderTest vendor/silverstripe/framework/tests": Run a single test
- "phpunit <dash><dash>coverage-html assets/": Generate coverage report
More information:
- http://www.phpunit.de/manual/current/en/textui.html
@ -16,35 +17,41 @@
It is safe to remove this file for normal website operation.
-->
<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.0/phpunit.xsd"
bootstrap="vendor/silverstripe/framework/tests/bootstrap.php"
colors="true">
<testsuite name="Default">
<directory>mysite/tests</directory>
<directory>vendor/silverstripe/cms/tests/php</directory>
<directory>vendor/silverstripe/framework/tests/php</directory>
</testsuite>
<testsuites>
<testsuite name="Default">
<directory>mysite/tests</directory>
<directory>vendor/silverstripe/cms/tests/php</directory>
<directory>vendor/silverstripe/framework/tests/php</directory>
</testsuite>
<!-- core components -->
<testsuite name="core">
<directory>vendor/silverstripe/framework/tests/php/</directory>
<directory>vendor/silverstripe/assets/tests/php/</directory>
<directory>vendor/silverstripe/versioned/tests/php/</directory>
</testsuite>
<!-- core components -->
<testsuite name="core">
<directory>vendor/silverstripe/framework/tests/php/</directory>
<directory>vendor/silverstripe/assets/tests/php/</directory>
<directory>vendor/silverstripe/versioned/tests/php/</directory>
</testsuite>
<!-- admin components -->
<testsuite name="admin">
<directory>vendor/silverstripe/cms/tests/</directory>
<directory>vendor/silverstripe/admin/tests/php/</directory>
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>vendor/silverstripe/asset-admin/tests/php/</directory>
<directory>vendor/silverstripe/graphql/tests/</directory>
<directory>vendor/silverstripe/siteconfig/tests/php/</directory>
<directory>vendor/silverstripe/reports/tests/</directory>
</testsuite>
<!-- admin components -->
<testsuite name="admin">
<directory>vendor/silverstripe/cms/tests/</directory>
<directory>vendor/silverstripe/admin/tests/php/</directory>
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>vendor/silverstripe/asset-admin/tests/php/</directory>
<directory>vendor/silverstripe/graphql/tests/</directory>
<directory>vendor/silverstripe/siteconfig/tests/php/</directory>
<directory>vendor/silverstripe/reports/tests/</directory>
</testsuite>
</testsuites>
<groups>
<exclude>
<group>sanitychecks</group>
</exclude>
</groups>
<groups>
<exclude>
<group>sanitychecks</group>
</exclude>
</groups>
</phpunit>