From 18714ae9f0b8efce630a26633aaf35917ee7e8af Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Sun, 19 Jul 2020 01:42:58 -0600 Subject: [PATCH] Add L6 as a dep to the modules to prevent people with older Laravel versions from accidentally pulling in the L6 update --- composer.json | 4 ++-- modules/backend/composer.json | 3 ++- modules/cms/composer.json | 3 ++- modules/system/composer.json | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 64a151edd..06edcd9a6 100644 --- a/composer.json +++ b/composer.json @@ -19,10 +19,12 @@ { "name": "Luke Towers", "email": "octobercms@luketowers.ca", + "homepage": "https://luketowers.ca", "role": "Maintainer" } ], "support": { + "paid": "https://octobercms.com/premium-support", "issues": "https://github.com/octobercms/october/issues", "forum": "https://octobercms.com/forum/", "docs": "https://octobercms.com/docs/", @@ -30,8 +32,6 @@ }, "require": { "php": ">=7.2", - "ext-mbstring": "*", - "ext-openssl": "*", "october/rain": "dev-wip/laravel-6 as 1.0", "october/system": "dev-wip/laravel-6", "october/backend": "dev-wip/laravel-6", diff --git a/modules/backend/composer.json b/modules/backend/composer.json index e5f1223ae..5d4231af2 100644 --- a/modules/backend/composer.json +++ b/modules/backend/composer.json @@ -26,7 +26,8 @@ "require": { "php": ">=7.2", "composer/installers": "~1.0", - "october/rain": "~1.0" + "october/rain": "~1.0", + "laravel/framework": "~6.0" }, "autoload": { "psr-4": { diff --git a/modules/cms/composer.json b/modules/cms/composer.json index f2041bcde..9e4cfa70e 100644 --- a/modules/cms/composer.json +++ b/modules/cms/composer.json @@ -26,7 +26,8 @@ "require": { "php": ">=7.2", "composer/installers": "~1.0", - "october/rain": "~1.0" + "october/rain": "~1.0", + "laravel/framework": "~6.0" }, "autoload": { "psr-4": { diff --git a/modules/system/composer.json b/modules/system/composer.json index 01bfb7e11..81d59a4dc 100644 --- a/modules/system/composer.json +++ b/modules/system/composer.json @@ -26,7 +26,8 @@ "require": { "php": ">=7.2", "composer/installers": "~1.0", - "october/rain": "~1.0" + "october/rain": "~1.0", + "laravel/framework": "~6.0" }, "autoload": { "psr-4": {