From 28d72d367f9174287d7bfdf07186f2764962b577 Mon Sep 17 00:00:00 2001 From: Igor Babko Date: Sat, 14 Sep 2019 13:14:10 +0300 Subject: [PATCH 1/2] Add Laravel v6 support --- .gitignore | 1 + CHANGELOG.md | 9 +++++++++ composer.json | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 CHANGELOG.md diff --git a/.gitignore b/.gitignore index f6533a8..58a90c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .php_cs.cache +.phpunit.result.cache build composer.lock files diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..9d9fc2c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +# Changelog + +All notable changes to `laravel-messenger` will be documented in this file. + +## [Unreleased] + +### Added + +- ([#321](https://github.com/cmgmyr/laravel-messenger/pull/321)) Laravel 6 support diff --git a/composer.json b/composer.json index 17f3765..20c37eb 100644 --- a/composer.json +++ b/composer.json @@ -13,14 +13,14 @@ ], "require": { "php": "^7.1.3", - "illuminate/config": ">=5.5 <6.0", - "illuminate/support": ">=5.5 <6.0", - "illuminate/database": ">=5.5 <6.0" + "illuminate/config": "^5.5|^6.0", + "illuminate/support": "^5.5|^6.0", + "illuminate/database": "^5.5|^6.0" }, "require-dev": { "adamwathan/faktory": "0.3.*", "friendsofphp/php-cs-fixer": "^2.5", - "orchestra/testbench": "~3.0", + "orchestra/testbench": "^3.0|^4.0", "phpunit/phpunit": "^7.0" }, "autoload": { From f2de65c89d02e67bc29df5cb05343d339f15528c Mon Sep 17 00:00:00 2001 From: Chris Gmyr Date: Mon, 16 Sep 2019 08:29:51 -0400 Subject: [PATCH 2/2] rm changelog --- CHANGELOG.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 9d9fc2c..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,9 +0,0 @@ -# Changelog - -All notable changes to `laravel-messenger` will be documented in this file. - -## [Unreleased] - -### Added - -- ([#321](https://github.com/cmgmyr/laravel-messenger/pull/321)) Laravel 6 support