Merge branch '4.5' into 4

This commit is contained in:
Garion Herman 2020-03-03 15:20:24 +13:00
commit 46f687ab5a
4 changed files with 29 additions and 5 deletions

View File

@ -4,9 +4,19 @@
- -
{% if version.stability == 'rc' %}
## Release Candidate
This version of Silverstripe CMS is a **release candidate** for an upcoming stable version, and should not be applied to production websites. We encourage developers to test this version in development / testing environments and report any issues they encounter via GitHub.
{% elseif version.stable %}
## Upgrading {{ '{#upgrading}' }} ## Upgrading {{ '{#upgrading}' }}
... ...
{% endif %}
{{ logs }} {{ logs }}

View File

@ -42,6 +42,10 @@ matrix:
env: env:
- PHPUNIT_TEST=core - PHPUNIT_TEST=core
- DB=PGSQL - DB=PGSQL
- php: 7.4
env:
- PHPUNIT_TEST=core
- DB=MYSQL
# admin php tests # admin php tests
- php: 7.1 - php: 7.1
env: env:
@ -52,6 +56,10 @@ matrix:
- PHPUNIT_TEST=admin - PHPUNIT_TEST=admin
- DB=MYSQL - DB=MYSQL
- PDO=1 - PDO=1
- php: 7.4
env:
- PHPUNIT_TEST=admin
- DB=MYSQL
# behat tests # behat tests
- php: 7.1 - php: 7.1
env: env:
@ -66,6 +74,10 @@ matrix:
- BEHAT_TEST="@asset-admin" - BEHAT_TEST="@asset-admin"
- DB=MYSQL - DB=MYSQL
- php: 7.3 - php: 7.3
env:
- HEALTH_TEST=1
- DB=PGSQL
- php: 7.4
env: env:
- HEALTH_TEST=1 - HEALTH_TEST=1
- DB=MYSQL - DB=MYSQL

View File

@ -4,8 +4,9 @@ Base project folder for a SilverStripe ([http://silverstripe.org](http://silvers
## Installation ## ## Installation ##
See [installation on different platforms](http://doc.silverstripe.org/framework/en/installation/), `composer create-project silverstripe/installer my-app`
and [installation from source](http://doc.silverstripe.org/framework/en/installation/from-source).
See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information.
## Bugtracker ## ## Bugtracker ##
@ -15,11 +16,11 @@ Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/
## Development and Contribution ## ## Development and Contribution ##
If you would like to make changes to the SilverStripe core codebase, we have an extensive [guide to contributing code](http://doc.silverstripe.org/framework/en/misc/contributing/code). If you would like to make changes to the SilverStripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/4/contributing/code/).
## Links ## ## Links ##
* [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/) * [Changelogs](https://docs.silverstripe.org/en/4/changelogs/)
* [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues) * [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
* [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues) * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
* [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues) * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)

View File

@ -10,7 +10,8 @@
"silverstripe/login-forms": "^4.0" "silverstripe/login-forms": "^4.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7" "phpunit/phpunit": "^5.7",
"sminnee/phpunit-mock-objects": "^3.4.5"
}, },
"extra": { "extra": {
"project-files": [ "project-files": [