From e3230a7371ef99a5a905ba4e87fba4e16860061e Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Thu, 14 Nov 2019 01:24:53 +0000 Subject: [PATCH 1/5] Remove obsolete branch-alias --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index d6e2f77..7786a64 100644 --- a/composer.json +++ b/composer.json @@ -20,9 +20,6 @@ "assets/*", "favicon.ico" ], - "branch-alias": { - "4.x-dev": "4.5.x-dev" - }, "resources-dir": "_resources" }, "config": { @@ -30,4 +27,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} +} \ No newline at end of file From e5840dfbeb191cccaf9462f666accc8105c8db9d Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Mon, 6 Jan 2020 10:42:57 +1300 Subject: [PATCH 2/5] DOC Update README with valid links to documentation --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5d041de..ab9eaeb 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,9 @@ Base project folder for a SilverStripe ([http://silverstripe.org](http://silvers ## Installation ## -See [installation on different platforms](http://doc.silverstripe.org/framework/en/installation/), -and [installation from source](http://doc.silverstripe.org/framework/en/installation/from-source). +`composer create-project silverstripe/installer my-app` + +See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information. ## Bugtracker ## @@ -15,11 +16,11 @@ Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/ ## 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 ## - * [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: CMS](https://github.com/silverstripe/silverstripe-cms/issues) * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues) From 966f7343d548970f6b4a77463e99b1d8c47ba0cf Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 15 Jan 2020 11:44:26 +1300 Subject: [PATCH 3/5] DOC Adjust changelog template for RC releases --- .cow/changelog.md.twig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.cow/changelog.md.twig b/.cow/changelog.md.twig index 89874f3..cb6337a 100644 --- a/.cow/changelog.md.twig +++ b/.cow/changelog.md.twig @@ -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}' }} ... +{% endif %} + {{ logs }} From 02ca9d772ad67456e86f73a54c749cee6c836e15 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 26 Feb 2020 14:58:21 +1300 Subject: [PATCH 4/5] Update Travis config to include PHP 7.4 builds --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 21aaac1..1361f19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,10 @@ matrix: env: - PHPUNIT_TEST=core - DB=PGSQL + - php: 7.4 + env: + - PHPUNIT_TEST=core + - DB=MYSQL # admin php tests - php: 7.1 env: @@ -52,6 +56,10 @@ matrix: - PHPUNIT_TEST=admin - DB=MYSQL - PDO=1 + - php: 7.4 + env: + - PHPUNIT_TEST=admin + - DB=MYSQL # behat tests - php: 7.1 env: @@ -66,6 +74,10 @@ matrix: - BEHAT_TEST="@asset-admin" - DB=MYSQL - php: 7.3 + env: + - HEALTH_TEST=1 + - DB=PGSQL + - php: 7.4 env: - HEALTH_TEST=1 - DB=MYSQL From 685193565243207c54c29fd9127c481360ebab74 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 26 Feb 2020 16:45:52 +1300 Subject: [PATCH 5/5] Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7786a64..937d349 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,8 @@ "silverstripe-themes/simple": "~3.2.0" }, "require-dev": { - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^5.7", + "sminnee/phpunit-mock-objects": "^3.4.5" }, "extra": { "project-files": [ @@ -27,4 +28,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +}