From dd70bec9f4b4fb2cb3e76c19e318c9d2e449fc36 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 9 Feb 2023 12:36:37 +1300 Subject: [PATCH 01/19] MNT Update development dependencies --- composer.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 6de3e15..966945b 100644 --- a/composer.json +++ b/composer.json @@ -5,10 +5,10 @@ "require": { "php": "^8.1", "silverstripe/recipe-plugin": "^2", - "silverstripe/vendor-plugin": "^2", - "silverstripe/recipe-cms": "5.x-dev", + "silverstripe/vendor-plugin": "2.0.x-dev", + "silverstripe/recipe-cms": "5.0.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "5.x-dev" + "silverstripe/login-forms": "5.0.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" @@ -18,7 +18,6 @@ "app/_config/*", ".env.example", ".graphql-generated/*" - ], "public-files": [ "assets/*", @@ -35,4 +34,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} +} \ No newline at end of file From 602914a5e3230703aab457e61cb876bd364499a9 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 9 Feb 2023 15:04:52 +1300 Subject: [PATCH 02/19] MNT Update release dependencies --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 966945b..e15a1d1 100644 --- a/composer.json +++ b/composer.json @@ -5,10 +5,10 @@ "require": { "php": "^8.1", "silverstripe/recipe-plugin": "^2", - "silverstripe/vendor-plugin": "2.0.x-dev", - "silverstripe/recipe-cms": "5.0.x-dev", + "silverstripe/vendor-plugin": "~2.0.0@stable", + "silverstripe/recipe-cms": "~5.0.0@beta", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "5.0.x-dev" + "silverstripe/login-forms": "~5.0.0@beta" }, "require-dev": { "phpunit/phpunit": "^9.5" From f89a827515ad67690ad64dddab8637e579ca876f Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 9 Feb 2023 15:04:56 +1300 Subject: [PATCH 03/19] MNT Update development dependencies --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index e15a1d1..966945b 100644 --- a/composer.json +++ b/composer.json @@ -5,10 +5,10 @@ "require": { "php": "^8.1", "silverstripe/recipe-plugin": "^2", - "silverstripe/vendor-plugin": "~2.0.0@stable", - "silverstripe/recipe-cms": "~5.0.0@beta", + "silverstripe/vendor-plugin": "2.0.x-dev", + "silverstripe/recipe-cms": "5.0.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "~5.0.0@beta" + "silverstripe/login-forms": "5.0.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From c9bfb0e2a6d739628ba457e7594b35836588ff7a Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 24 Feb 2023 10:38:53 +1300 Subject: [PATCH 04/19] ENH Remove duplicated configuration This is the default configuration in assets now. No need to double up on it. --- app/_config/assets.yml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 app/_config/assets.yml diff --git a/app/_config/assets.yml b/app/_config/assets.yml deleted file mode 100644 index 1ccbd65..0000000 --- a/app/_config/assets.yml +++ /dev/null @@ -1,26 +0,0 @@ -# SilverStripe 4.4 changes the way files are resolved. `silverstripe-assets` resolves files using a variety of formats -# by default. When starting a brand new project on SilverStripe 4.4 or greater, those extra formats are not needed and -# will slowdown file resolution requests a bit. This config removes those redundant formats. - ---- -Name: project-assetsflysystem -After: '#assetsflysystem' ---- -SilverStripe\Core\Injector\Injector: - # Define public resolution strategy - SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.public: - class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy - properties: - ResolutionFileIDHelpers: - - '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper' - - '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper' - DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper' - VersionedStage: Live - # Define protected resolution strategy - SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.protected: - class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy - properties: - DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper' - ResolutionFileIDHelpers: - - '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper' - VersionedStage: Stage From e9fcd38f527dea980a58a9c03017e46b35edf3f7 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 12:21:28 +1300 Subject: [PATCH 05/19] MNT Update development dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 0420941..c28d530 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "4.x-dev", + "silverstripe/recipe-cms": "4.13.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "4.x-dev" + "silverstripe/login-forms": "4.9.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From f38f39761e7123081c4efac06bed0cec1f182538 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:31:40 +1300 Subject: [PATCH 06/19] MNT Update release dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c28d530..e3e5433 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "4.13.x-dev", + "silverstripe/recipe-cms": "~4.13.0@beta", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "4.9.x-dev" + "silverstripe/login-forms": "~4.9.0@beta" }, "require-dev": { "phpunit/phpunit": "^9.5" From f2f74551778feb15815687fb6ec250664a28a437 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:31:44 +1300 Subject: [PATCH 07/19] MNT Update development dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e3e5433..c28d530 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "~4.13.0@beta", + "silverstripe/recipe-cms": "4.13.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "~4.9.0@beta" + "silverstripe/login-forms": "4.9.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From ea654c1c9e3bb8066d6b521cb4dba14056c1e76c Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 21 Mar 2023 14:10:08 +1300 Subject: [PATCH 08/19] MNT Use gha-dispatch-ci --- .github/workflows/ci.yml | 5 ----- .github/workflows/dispatch-ci.yml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/dispatch-ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74f20d7..ee71c20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,15 +4,10 @@ on: push: pull_request: workflow_dispatch: - # Every day at 4:00pm UTC - schedule: - - cron: '0 16 * * *' jobs: ci: name: CI - # Only run cron on the silverstripe account - if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 with: # installer contains a sample behat.yml file, though there are no behat tests to run diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml new file mode 100644 index 0000000..beb7c4f --- /dev/null +++ b/.github/workflows/dispatch-ci.yml @@ -0,0 +1,16 @@ +name: Dispatch CI + +on: + # At 4:00 PM and 5:00 PM + schedule: + - cron: '0 16,17 * * *' + +jobs: + dispatch-ci: + name: Dispatch CI + # Only run cron on the silverstripe account + if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') + runs-on: ubuntu-latest + steps: + - name: Dispatch CI + uses: silverstripe/gha-dispatch-ci@v1 From bd202820ded2e8e53ce63945d701ba1f28fbf55e Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 29 Mar 2023 12:37:18 +1300 Subject: [PATCH 09/19] MNT Update release dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c28d530..0a524ca 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "4.13.x-dev", + "silverstripe/recipe-cms": "~4.13.0@rc", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "4.9.x-dev" + "silverstripe/login-forms": "~4.9.0@rc" }, "require-dev": { "phpunit/phpunit": "^9.5" From b18c0372f2f733fb765f3bed4c1dfc123a8d1e3a Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 29 Mar 2023 12:37:21 +1300 Subject: [PATCH 10/19] MNT Update development dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 0a524ca..c28d530 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "~4.13.0@rc", + "silverstripe/recipe-cms": "4.13.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "~4.9.0@rc" + "silverstripe/login-forms": "4.9.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From 1316480fafb223b6831c29fe36b0087018e28625 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 5 Apr 2023 11:54:35 +1200 Subject: [PATCH 11/19] MNT Update development dependencies --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 966945b..4b79555 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "description": "The SilverStripe Framework Installer", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "^2", + "silverstripe/recipe-plugin": "2.0.x-dev", "silverstripe/vendor-plugin": "2.0.x-dev", "silverstripe/recipe-cms": "5.0.x-dev", "silverstripe-themes/simple": "~3.2.0", From 96e34a5cd17e73b026b025b0aee5c340b6d579d4 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 5 Apr 2023 14:54:39 +1200 Subject: [PATCH 12/19] MNT Update release dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 4b79555..e79360a 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "description": "The SilverStripe Framework Installer", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.0.x-dev", - "silverstripe/vendor-plugin": "2.0.x-dev", - "silverstripe/recipe-cms": "5.0.x-dev", + "silverstripe/recipe-plugin": "~2.0.0@stable", + "silverstripe/vendor-plugin": "~2.0.0@stable", + "silverstripe/recipe-cms": "~5.0.0@rc", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "5.0.x-dev" + "silverstripe/login-forms": "~5.0.0@rc" }, "require-dev": { "phpunit/phpunit": "^9.5" From 1f990c02f2e32fc78cb694a18b73ea416b6b396c Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 5 Apr 2023 14:54:43 +1200 Subject: [PATCH 13/19] MNT Update development dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index e79360a..4b79555 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "description": "The SilverStripe Framework Installer", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "~2.0.0@stable", - "silverstripe/vendor-plugin": "~2.0.0@stable", - "silverstripe/recipe-cms": "~5.0.0@rc", + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/vendor-plugin": "2.0.x-dev", + "silverstripe/recipe-cms": "5.0.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "~5.0.0@rc" + "silverstripe/login-forms": "5.0.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From a5e2f36ab88dded66702e27286e83288e2cb2273 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 19 Apr 2023 16:18:57 +1200 Subject: [PATCH 14/19] DOC Update README.md for CMS 5 --- README.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 24cbcb6..1fe95c2 100644 --- a/README.md +++ b/README.md @@ -5,25 +5,27 @@ Base project folder for a Silverstripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme. -## Installation ## +## Installation -`composer create-project silverstripe/installer my-app` +```sh +composer create-project silverstripe/installer my-app +``` -See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information. +See [Getting Started](https://docs.silverstripe.org/en/getting_started/) for more information. -## Bugtracker ## +## Bugtracker Bugs are tracked on github.com ([framework issues](https://github.com/silverstripe/silverstripe-framework/issues), [cms issues](https://github.com/silverstripe/silverstripe-cms/issues)). -Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/contributing/issues_and_bugs/). +Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/contributing/issues_and_bugs/). -## 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](https://docs.silverstripe.org/en/4/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/contributing/code/). -## Links ## +## Links - * [Changelogs](https://docs.silverstripe.org/en/4/changelogs/) + * [Changelogs](https://docs.silverstripe.org/en/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 7264db0e346eed507d99f018ddf06407c614d87b Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 26 Apr 2023 12:08:13 +1200 Subject: [PATCH 15/19] MNT Update release dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c28d530..bdc02d2 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "4.13.x-dev", + "silverstripe/recipe-cms": "~4.13.0@stable", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "4.9.x-dev" + "silverstripe/login-forms": "~4.9.0@stable" }, "require-dev": { "phpunit/phpunit": "^9.5" From a8f62aab68f022c89aa335ac08e6b8630096b735 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 26 Apr 2023 12:08:16 +1200 Subject: [PATCH 16/19] MNT Update development dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index bdc02d2..c28d530 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "~4.13.0@stable", + "silverstripe/recipe-cms": "4.13.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "~4.9.0@stable" + "silverstripe/login-forms": "4.9.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From 6b966add4227a3112c5cffa87bdbc030465ac5f2 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 26 Apr 2023 12:45:22 +1200 Subject: [PATCH 17/19] MNT Update development dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c28d530..0420941 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "4.13.x-dev", + "silverstripe/recipe-cms": "4.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "4.9.x-dev" + "silverstripe/login-forms": "4.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From 327017690bfd141892207ae73d6921027573f6e1 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 4 May 2023 12:36:05 +1200 Subject: [PATCH 18/19] MNT Update release dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 4b79555..ad0fdea 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "description": "The SilverStripe Framework Installer", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.0.x-dev", - "silverstripe/vendor-plugin": "2.0.x-dev", - "silverstripe/recipe-cms": "5.0.x-dev", + "silverstripe/recipe-plugin": "~2.0.0@stable", + "silverstripe/vendor-plugin": "~2.0.0@stable", + "silverstripe/recipe-cms": "~5.0.0@stable", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "5.0.x-dev" + "silverstripe/login-forms": "~5.0.0@stable" }, "require-dev": { "phpunit/phpunit": "^9.5" From eaa41f179b17dfe29c121453130672f674f0221f Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 4 May 2023 12:36:10 +1200 Subject: [PATCH 19/19] MNT Update development dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index ad0fdea..4b79555 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "description": "The SilverStripe Framework Installer", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "~2.0.0@stable", - "silverstripe/vendor-plugin": "~2.0.0@stable", - "silverstripe/recipe-cms": "~5.0.0@stable", + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/vendor-plugin": "2.0.x-dev", + "silverstripe/recipe-cms": "5.0.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "~5.0.0@stable" + "silverstripe/login-forms": "5.0.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5"