tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 15:05:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #310 from creative-commoners/pulls/4/sapphire-test-nine

Browse Source 
API phpunit 9 support
This commit is contained in:
Maxime Rainville 2021-11-10 17:11:08 +13:00 committed by GitHub
commit e48b1662a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -14,14 +14,14 @@ matrix:
fast_finish: true fast_finish: true
include: include:
# Core php tests # Core php tests
- php: 7.1 - php: 7.3
env: env:
- DB=MYSQL - DB=MYSQL
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
- PHPUNIT_SUITE="core" - PHPUNIT_SUITE="core"
- PDO=1 - PDO=1
- COMPOSER_INSTALL_ARG="--prefer-lowest" - COMPOSER_INSTALL_ARG="--prefer-lowest"
- php: 7.2 - php: 7.3
env: env:
- DB=MYSQL - DB=MYSQL
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
@ -43,14 +43,14 @@ matrix:
- PHPUNIT_SUITE="core" - PHPUNIT_SUITE="core"
- COMPOSER_INSTALL_ARG="--ignore-platform-reqs" - COMPOSER_INSTALL_ARG="--ignore-platform-reqs"
# admin php tests # admin php tests
- php: 7.1 - php: 7.3
env: env:
- DB=MYSQL - DB=MYSQL
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin" - PHPUNIT_SUITE="admin"
- PDO=1 - PDO=1
- COMPOSER_INSTALL_ARG="--prefer-lowest" - COMPOSER_INSTALL_ARG="--prefer-lowest"
- php: 7.2 - php: 7.3
env: env:
- DB=PGSQL - DB=PGSQL
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
@ -67,12 +67,12 @@ matrix:
- PHPUNIT_SUITE="admin" - PHPUNIT_SUITE="admin"
- COMPOSER_INSTALL_ARG="--ignore-platform-reqs" - COMPOSER_INSTALL_ARG="--ignore-platform-reqs"
# behat tests # behat tests
- php: 7.1 - php: 7.3
env: env:
- DB=MYSQL - DB=MYSQL
- BEHAT_TEST=1 - BEHAT_TEST=1
- BEHAT_SUITE="admin" - BEHAT_SUITE="admin"
- php: 7.2 - php: 7.3
env: env:
- DB=MYSQL - DB=MYSQL
- BEHAT_TEST=1 - BEHAT_TEST=1

5
composer.json
View File

@ -3,15 +3,14 @@
"type": "silverstripe-recipe", "type": "silverstripe-recipe",
"description": "The SilverStripe Framework Installer", "description": "The SilverStripe Framework Installer",
"require": { "require": {
"php": "^7.1 || ^8", "php": "^7.3 || ^8.0",
"silverstripe/recipe-plugin": "^1.2", "silverstripe/recipe-plugin": "^1.2",
"silverstripe/recipe-cms": "4.x-dev", "silverstripe/recipe-cms": "4.x-dev",
"silverstripe-themes/simple": "~3.2.0", "silverstripe-themes/simple": "~3.2.0",
"silverstripe/login-forms": "4.x-dev" "silverstripe/login-forms": "4.x-dev"
}, },
"require-dev": { "require-dev": {
"sminnee/phpunit": "^5.7", "phpunit/phpunit": "^9.5"
"sminnee/phpunit-mock-objects": "^3.4.5"
}, },
"extra": { "extra": {
"project-files": [ "project-files": [

52
phpunit.xml.dist
View File

@ -1,7 +1,7 @@
<!-- <!--
PHPUnit configuration for SilverStripe PHPUnit configuration for SilverStripe
Requires PHPUnit 5+ Requires PHPUnit 9+
Usage: Usage:
- "vendor/bin/phpunit": Runs all tests in all folders - "vendor/bin/phpunit": Runs all tests in all folders
@ -18,31 +18,33 @@
It is safe to remove this file for normal website operation. It is safe to remove this file for normal website operation.
--> -->
<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true"> <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
<testsuite name="Default"> <testsuites>
<directory>app/tests</directory> <testsuite name="Default">
<directory>vendor/silverstripe/cms/tests/php</directory> <directory>app/tests</directory>
<directory>vendor/silverstripe/framework/tests/php</directory> <directory>vendor/silverstripe/cms/tests/php</directory>
</testsuite> <directory>vendor/silverstripe/framework/tests/php</directory>
</testsuite>
<!-- framework only --> <!-- framework only -->
<testsuite name="framework"> <testsuite name="framework">
<directory>vendor/silverstripe/framework/tests/php/</directory> <directory>vendor/silverstripe/framework/tests/php/</directory>
</testsuite> </testsuite>
<!-- other core components --> <!-- other core components -->
<testsuite name="core"> <testsuite name="core">
<directory>vendor/silverstripe/assets/tests/php/</directory> <directory>vendor/silverstripe/assets/tests/php/</directory>
<directory>vendor/silverstripe/versioned/tests/php/</directory> <directory>vendor/silverstripe/versioned/tests/php/</directory>
</testsuite> </testsuite>
<!-- admin components --> <!-- admin components -->
<testsuite name="admin"> <testsuite name="admin">
<directory>vendor/silverstripe/admin/tests/php/</directory> <directory>vendor/silverstripe/admin/tests/php/</directory>
<directory>vendor/silverstripe/asset-admin/tests/php/</directory> <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory> <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>vendor/silverstripe/cms/tests/</directory> <directory>vendor/silverstripe/cms/tests/</directory>
<directory>vendor/silverstripe/graphql/tests/</directory> <directory>vendor/silverstripe/graphql/tests/</directory>
<directory>vendor/silverstripe/reports/tests/</directory> <directory>vendor/silverstripe/reports/tests/</directory>
<directory>vendor/silverstripe/siteconfig/tests/php/</directory> <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
</testsuite> </testsuite>
</testsuites>
</phpunit> </phpunit>