Skip to content

Commit b4824ff

Browse files
arcanedev-marocarcanedev-maroc
authored
Merge pull request #15 from ARCANEDEV/update-laravel_5.8
Adding Laravel 5.8 support
2 parents 122122a + 446635d commit b4824ff

File tree

9 files changed

+20
-18
lines changed

9 files changed

+20
-18
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This Laravel Messenger will allow you to add a messaging system into your Larave
2222
* Easy setup & configuration.
2323
* Well documented & IDE Friendly.
2424
* Well tested with maximum code quality.
25-
* Laravel `5.1` to `5.7` are supported.
25+
* Laravel `5.1` to `5.8` are supported.
2626
* Made with :heart: & :coffee:.
2727

2828
## Table of contents
@@ -45,7 +45,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
4545
- [All Contributors][link-contributors]
4646
- [cmgmyr/laravel-messenger](https://github.com/cmgmyr/laravel-messenger)
4747

48-
[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%205.7-orange.svg?style=flat-square
48+
[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%205.8-orange.svg?style=flat-square
4949
[badge_license]: https://img.shields.io/packagist/l/arcanedev/laravel-messenger.svg?style=flat-square
5050
[badge_build]: https://img.shields.io/travis/ARCANEDEV/LaravelMessenger.svg?style=flat-square
5151
[badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelMessenger.svg?style=flat-square

‎_docs/0-Home.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This Laravel Messenger will allow you to add a messaging system into your Larave
88
* Easy setup & configuration.
99
* Well documented & IDE Friendly.
1010
* Well tested with maximum code quality.
11-
* Laravel `5.1` to `5.7` are supported.
11+
* Laravel `5.1` to `5.8` are supported.
1212
* Made with :heart: & :coffee:.
1313

1414
## Table of contents

‎_docs/1-Installation-and-Setup.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
| ![LaravelMessenger v3.x][laravel_messenger_3_x] | ![Laravel v5.5][laravel_5_5] |
1616
| ![LaravelMessenger v4.x][laravel_messenger_4_x] | ![Laravel v5.6][laravel_5_6] |
1717
| ![LaravelMessenger v5.x][laravel_messenger_5_x] | ![Laravel v5.7][laravel_5_7] |
18+
| ![LaravelMessenger v6.x][laravel_messenger_6_x] | ![Laravel v5.8][laravel_5_8] |
1819

1920
[laravel_5_1]: https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1"
2021
[laravel_5_2]: https://img.shields.io/badge/v5.2-supported-brightgreen.svg?style=flat-square "Laravel v5.2"
@@ -23,12 +24,14 @@
2324
[laravel_5_5]: https://img.shields.io/badge/v5.5-supported-brightgreen.svg?style=flat-square "Laravel v5.5"
2425
[laravel_5_6]: https://img.shields.io/badge/v5.6-supported-brightgreen.svg?style=flat-square "Laravel v5.6"
2526
[laravel_5_7]: https://img.shields.io/badge/v5.7-supported-brightgreen.svg?style=flat-square "Laravel v5.7"
27+
[laravel_5_8]: https://img.shields.io/badge/v5.8-supported-brightgreen.svg?style=flat-square "Laravel v5.8"
2628

2729
[laravel_messenger_1_x]: https://img.shields.io/badge/version-1.*-blue.svg?style=flat-square "LaravelMessenger v1.*"
2830
[laravel_messenger_2_x]: https://img.shields.io/badge/version-2.*-blue.svg?style=flat-square "LaravelMessenger v2.*"
2931
[laravel_messenger_3_x]: https://img.shields.io/badge/version-3.*-blue.svg?style=flat-square "LaravelMessenger v3.*"
3032
[laravel_messenger_4_x]: https://img.shields.io/badge/version-4.*-blue.svg?style=flat-square "LaravelMessenger v4.*"
3133
[laravel_messenger_5_x]: https://img.shields.io/badge/version-5.*-blue.svg?style=flat-square "LaravelMessenger v5.*"
34+
[laravel_messenger_6_x]: https://img.shields.io/badge/version-6.*-blue.svg?style=flat-square "LaravelMessenger v6.*"
3235

3336
## Composer
3437

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"license": "MIT",
1818
"require": {
1919
"php": ">=7.1.3",
20-
"arcanedev/support": "~4.4.0"
20+
"arcanedev/support": "~4.5.0"
2121
},
2222
"require-dev": {
23-
"orchestra/testbench": "~3.7.0",
23+
"orchestra/testbench": "~3.8.0",
2424
"mockery/mockery": "~1.1",
25-
"phpunit/phpunit": "~7.0",
26-
"phpunit/phpcov": "~5.0"
25+
"phpunit/phpunit": "~7.0|~8.0",
26+
"phpunit/phpcov": "~5.0|~6.0"
2727
},
2828
"autoload": {
2929
"psr-4": {

‎src/Models/Discussion.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
use Arcanedev\LaravelMessenger\Contracts\Discussion as DiscussionContract;
44
use Arcanedev\LaravelMessenger\Contracts\Message as MessageContract;
55
use Arcanedev\LaravelMessenger\Contracts\Participation as ParticipationContract;
6-
use Carbon\Carbon;
76
use Illuminate\Database\Eloquent\Builder;
87
use Illuminate\Database\Eloquent\Model as EloquentModel;
98
use Illuminate\Database\Eloquent\SoftDeletes;
109
use Illuminate\Database\Query\JoinClause;
10+
use Illuminate\Support\Carbon;
1111
use Illuminate\Support\Collection;
1212

1313
/**

‎tests/LaravelMessengerServiceProviderTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ class LaravelMessengerServiceProviderTest extends TestCase
2323
| -----------------------------------------------------------------
2424
*/
2525

26-
public function setUp()
26+
public function setUp(): void
2727
{
2828
parent::setUp();
2929

3030
$this->provider = $this->app->getProvider(LaravelMessengerServiceProvider::class);
3131
}
3232

33-
public function tearDown()
33+
public function tearDown(): void
3434
{
3535
unset($this->provider);
3636

‎tests/Models/DiscussionTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Arcanedev\LaravelMessenger\Models\Participation;
66
use Arcanedev\LaravelMessenger\Tests\Stubs\Models\User;
77
use Arcanedev\LaravelMessenger\Tests\TestCase;
8-
use Carbon\Carbon;
8+
use Illuminate\Support\Carbon;
99
use Illuminate\Support\Collection;
1010

1111
/**
@@ -286,7 +286,7 @@ public function it_can_get_participants_string()
286286
$participants = $discussion->addParticipants($this->users);
287287

288288
$rendered = $discussion->participationsString();
289-
static::assertContains(', ', $rendered);
289+
static::assertStringContainsString(', ', $rendered);
290290
static::assertCount($participants->count(), explode(', ', $rendered));
291291
}
292292

‎tests/TestCase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ abstract class TestCase extends BaseTestCase
2828
| -----------------------------------------------------------------
2929
*/
3030

31-
public function setUp()
31+
public function setUp(): void
3232
{
3333
parent::setUp();
3434

‎tests/Traits/MessagableTest.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?php namespace Arcanedev\LaravelMessenger\Tests\Traits;
22

3-
use Arcanedev\LaravelMessenger\Models\Discussion;
4-
use Arcanedev\LaravelMessenger\Models\Message;
5-
use Arcanedev\LaravelMessenger\Models\Participation;
6-
use Arcanedev\LaravelMessenger\Tests\Stubs\Models\User;
3+
use Arcanedev\LaravelMessenger\Models\{
4+
Discussion, Message, Participation
5+
};
76
use Arcanedev\LaravelMessenger\Tests\TestCase;
8-
use Carbon\Carbon;
7+
use Illuminate\Support\Carbon;
98

109
/**
1110
* Class MessagableTest

0 commit comments

Comments
 (0)