From 0d7e3700b0a97c54510cd55e7a8ac30c89c713ca Mon Sep 17 00:00:00 2001 From: = Date: Thu, 13 May 2021 22:01:02 +0200 Subject: [PATCH 1/2] Updating composer.json to laravel 9 for upgrading winter --- composer.json | 12 ++++++------ modules/backend/composer.json | 4 ++-- modules/cms/composer.json | 4 ++-- modules/system/composer.json | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index ccad9a95fe..7190cf4716 100644 --- a/composer.json +++ b/composer.json @@ -29,12 +29,12 @@ "source": "https://github.com/wintercms/winter" }, "require": { - "php": ">=7.2.9", - "winter/storm": "dev-develop as 1.1.999", - "winter/wn-system-module": "dev-develop as 1.1.999", - "winter/wn-backend-module": "dev-develop as 1.1.999", - "winter/wn-cms-module": "dev-develop as 1.1.999", - "laravel/framework": "~6.0", + "php": ">=7.4", + "winter/storm": "dev-wip/1.2 as 1.2.999", + "winter/wn-system-module": "dev-wip/1.2 as 1.2.999", + "winter/wn-backend-module": "dev-wip/1.2 as 1.2.999", + "winter/wn-cms-module": "dev-wip/1.2 as 1.2.999", + "laravel/framework": "~9.0", "wikimedia/composer-merge-plugin": "~2.0.1" }, "require-dev": { diff --git a/modules/backend/composer.json b/modules/backend/composer.json index 3277a8f3de..a057d8675e 100644 --- a/modules/backend/composer.json +++ b/modules/backend/composer.json @@ -23,9 +23,9 @@ } ], "require": { - "php": ">=7.2", + "php": ">=7.4", "composer/installers": "dev-main as 1.0", - "laravel/framework": "~6.0" + "laravel/framework": "~9.0" }, "autoload": { "psr-4": { diff --git a/modules/cms/composer.json b/modules/cms/composer.json index edc248af55..2ae5d15ffb 100644 --- a/modules/cms/composer.json +++ b/modules/cms/composer.json @@ -23,9 +23,9 @@ } ], "require": { - "php": ">=7.2", + "php": ">=7.4", "composer/installers": "dev-main as 1.0", - "laravel/framework": "~6.0" + "laravel/framework": "~9.0" }, "autoload": { "psr-4": { diff --git a/modules/system/composer.json b/modules/system/composer.json index 070a1a5d8a..e28f6738b5 100644 --- a/modules/system/composer.json +++ b/modules/system/composer.json @@ -23,9 +23,9 @@ } ], "require": { - "php": ">=7.2", + "php": ">=7.4", "composer/installers": "dev-main as 1.0", - "laravel/framework": "~6.0", + "laravel/framework": "~9.0", "composer/semver": "^3.2" }, "autoload": { From 33b8596402b394fa4b4493af2ea33f81d4a734d8 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 14 May 2021 18:33:52 +0200 Subject: [PATCH 2/2] Updated to laravel 9 dev, to mirror storm library --- composer.json | 2 +- modules/backend/composer.json | 2 +- modules/cms/composer.json | 2 +- modules/system/composer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 7190cf4716..043aff481f 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "winter/wn-system-module": "dev-wip/1.2 as 1.2.999", "winter/wn-backend-module": "dev-wip/1.2 as 1.2.999", "winter/wn-cms-module": "dev-wip/1.2 as 1.2.999", - "laravel/framework": "~9.0", + "laravel/framework": "9.x-dev", "wikimedia/composer-merge-plugin": "~2.0.1" }, "require-dev": { diff --git a/modules/backend/composer.json b/modules/backend/composer.json index a057d8675e..be4e898825 100644 --- a/modules/backend/composer.json +++ b/modules/backend/composer.json @@ -25,7 +25,7 @@ "require": { "php": ">=7.4", "composer/installers": "dev-main as 1.0", - "laravel/framework": "~9.0" + "laravel/framework": "9.x-dev" }, "autoload": { "psr-4": { diff --git a/modules/cms/composer.json b/modules/cms/composer.json index 2ae5d15ffb..8a24d05120 100644 --- a/modules/cms/composer.json +++ b/modules/cms/composer.json @@ -25,7 +25,7 @@ "require": { "php": ">=7.4", "composer/installers": "dev-main as 1.0", - "laravel/framework": "~9.0" + "laravel/framework": "9.x-dev" }, "autoload": { "psr-4": { diff --git a/modules/system/composer.json b/modules/system/composer.json index e28f6738b5..e53a36a916 100644 --- a/modules/system/composer.json +++ b/modules/system/composer.json @@ -25,7 +25,7 @@ "require": { "php": ">=7.4", "composer/installers": "dev-main as 1.0", - "laravel/framework": "~9.0", + "laravel/framework": "9.x-dev", "composer/semver": "^3.2" }, "autoload": {