diff --git a/README.md b/README.md index 8b9dcc3..ff80500 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ This Laravel Messenger will allow you to add a messaging system into your Larave * Easy setup & configuration. * Well documented & IDE Friendly. * Well tested with maximum code quality. - * Laravel `5.1` to `5.7` are supported. + * Laravel `5.1` to `5.8` are supported. * Made with :heart: & :coffee:. ## Table of contents @@ -45,7 +45,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail. - [All Contributors][link-contributors] - [cmgmyr/laravel-messenger](https://github.com/cmgmyr/laravel-messenger) -[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%205.7-orange.svg?style=flat-square +[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%205.8-orange.svg?style=flat-square [badge_license]: https://img.shields.io/packagist/l/arcanedev/laravel-messenger.svg?style=flat-square [badge_build]: https://img.shields.io/travis/ARCANEDEV/LaravelMessenger.svg?style=flat-square [badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelMessenger.svg?style=flat-square diff --git a/_docs/0-Home.md b/_docs/0-Home.md index 0fee116..ede986a 100644 --- a/_docs/0-Home.md +++ b/_docs/0-Home.md @@ -8,7 +8,7 @@ This Laravel Messenger will allow you to add a messaging system into your Larave * Easy setup & configuration. * Well documented & IDE Friendly. * Well tested with maximum code quality. - * Laravel `5.1` to `5.7` are supported. + * Laravel `5.1` to `5.8` are supported. * Made with :heart: & :coffee:. ## Table of contents diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md index 7af79d2..2f6b6d4 100644 --- a/_docs/1-Installation-and-Setup.md +++ b/_docs/1-Installation-and-Setup.md @@ -15,6 +15,7 @@ | ![LaravelMessenger v3.x][laravel_messenger_3_x] | ![Laravel v5.5][laravel_5_5] | | ![LaravelMessenger v4.x][laravel_messenger_4_x] | ![Laravel v5.6][laravel_5_6] | | ![LaravelMessenger v5.x][laravel_messenger_5_x] | ![Laravel v5.7][laravel_5_7] | +| ![LaravelMessenger v6.x][laravel_messenger_6_x] | ![Laravel v5.8][laravel_5_8] | [laravel_5_1]: https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1" [laravel_5_2]: https://img.shields.io/badge/v5.2-supported-brightgreen.svg?style=flat-square "Laravel v5.2" @@ -23,12 +24,14 @@ [laravel_5_5]: https://img.shields.io/badge/v5.5-supported-brightgreen.svg?style=flat-square "Laravel v5.5" [laravel_5_6]: https://img.shields.io/badge/v5.6-supported-brightgreen.svg?style=flat-square "Laravel v5.6" [laravel_5_7]: https://img.shields.io/badge/v5.7-supported-brightgreen.svg?style=flat-square "Laravel v5.7" +[laravel_5_8]: https://img.shields.io/badge/v5.8-supported-brightgreen.svg?style=flat-square "Laravel v5.8" [laravel_messenger_1_x]: https://img.shields.io/badge/version-1.*-blue.svg?style=flat-square "LaravelMessenger v1.*" [laravel_messenger_2_x]: https://img.shields.io/badge/version-2.*-blue.svg?style=flat-square "LaravelMessenger v2.*" [laravel_messenger_3_x]: https://img.shields.io/badge/version-3.*-blue.svg?style=flat-square "LaravelMessenger v3.*" [laravel_messenger_4_x]: https://img.shields.io/badge/version-4.*-blue.svg?style=flat-square "LaravelMessenger v4.*" [laravel_messenger_5_x]: https://img.shields.io/badge/version-5.*-blue.svg?style=flat-square "LaravelMessenger v5.*" +[laravel_messenger_6_x]: https://img.shields.io/badge/version-6.*-blue.svg?style=flat-square "LaravelMessenger v6.*" ## Composer diff --git a/composer.json b/composer.json index fd0b251..786823b 100644 --- a/composer.json +++ b/composer.json @@ -17,13 +17,13 @@ "license": "MIT", "require": { "php": ">=7.1.3", - "arcanedev/support": "~4.4.0" + "arcanedev/support": "~4.5.0" }, "require-dev": { - "orchestra/testbench": "~3.7.0", + "orchestra/testbench": "~3.8.0", "mockery/mockery": "~1.1", - "phpunit/phpunit": "~7.0", - "phpunit/phpcov": "~5.0" + "phpunit/phpunit": "~7.0|~8.0", + "phpunit/phpcov": "~5.0|~6.0" }, "autoload": { "psr-4": { diff --git a/src/Models/Discussion.php b/src/Models/Discussion.php index a37c3f7..4b375e3 100644 --- a/src/Models/Discussion.php +++ b/src/Models/Discussion.php @@ -3,11 +3,11 @@ use Arcanedev\LaravelMessenger\Contracts\Discussion as DiscussionContract; use Arcanedev\LaravelMessenger\Contracts\Message as MessageContract; use Arcanedev\LaravelMessenger\Contracts\Participation as ParticipationContract; -use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model as EloquentModel; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Query\JoinClause; +use Illuminate\Support\Carbon; use Illuminate\Support\Collection; /** diff --git a/tests/LaravelMessengerServiceProviderTest.php b/tests/LaravelMessengerServiceProviderTest.php index 7d7db19..fca8df5 100644 --- a/tests/LaravelMessengerServiceProviderTest.php +++ b/tests/LaravelMessengerServiceProviderTest.php @@ -23,14 +23,14 @@ class LaravelMessengerServiceProviderTest extends TestCase | ----------------------------------------------------------------- */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->provider = $this->app->getProvider(LaravelMessengerServiceProvider::class); } - public function tearDown() + public function tearDown(): void { unset($this->provider); diff --git a/tests/Models/DiscussionTest.php b/tests/Models/DiscussionTest.php index 43d18dd..4b5e6df 100644 --- a/tests/Models/DiscussionTest.php +++ b/tests/Models/DiscussionTest.php @@ -5,7 +5,7 @@ use Arcanedev\LaravelMessenger\Models\Participation; use Arcanedev\LaravelMessenger\Tests\Stubs\Models\User; use Arcanedev\LaravelMessenger\Tests\TestCase; -use Carbon\Carbon; +use Illuminate\Support\Carbon; use Illuminate\Support\Collection; /** @@ -286,7 +286,7 @@ public function it_can_get_participants_string() $participants = $discussion->addParticipants($this->users); $rendered = $discussion->participationsString(); - static::assertContains(', ', $rendered); + static::assertStringContainsString(', ', $rendered); static::assertCount($participants->count(), explode(', ', $rendered)); } diff --git a/tests/TestCase.php b/tests/TestCase.php index 9d0a91f..87e6d36 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -28,7 +28,7 @@ abstract class TestCase extends BaseTestCase | ----------------------------------------------------------------- */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/Traits/MessagableTest.php b/tests/Traits/MessagableTest.php index 0a73318..461f381 100644 --- a/tests/Traits/MessagableTest.php +++ b/tests/Traits/MessagableTest.php @@ -1,11 +1,10 @@