Skip to content

Commit 70a7fc1

Browse files
committed
Merge branch 'master' into v2
2 parents 0a74f94 + 1ae9999 commit 70a7fc1

File tree

8 files changed

+21
-31
lines changed

8 files changed

+21
-31
lines changed

Diff for: .github/ISSUE_TEMPLATE/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ contact_links:
1111
about: Learn how to notify us for sensitive bugs
1212
- name: Report a bug
1313
url: https://github.com/cmgmyr/laravel-messenger/issues/new
14-
about: Report a reproducable bug
14+
about: Report a reproducible bug

Diff for: .github/workflows/php-cs-fixer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v3
1212
with:
1313
ref: ${{ github.head_ref }}
1414

Diff for: .github/workflows/run-tests-mysql.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
operating-system: [ubuntu-latest]
31-
php-versions: [ '8.1', '8.0' ]
31+
php-versions: [ '8.2', '8.1' ]
3232
dependency-stability: [ prefer-stable ]
3333

3434
laravel: [ '10.*', '9.*' ]
@@ -44,16 +44,16 @@ jobs:
4444
name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
4545

4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v3
4848
- name: Install PHP versions
4949
uses: shivammathur/setup-php@v2
5050
with:
5151
php-version: ${{ matrix.php-versions }}
5252
- name: Get Composer Cache Directory 2
5353
id: composer-cache
5454
run: |
55-
echo "::set-output name=dir::$(composer config cache-files-dir)"
56-
- uses: actions/cache@v2
55+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
56+
- uses: actions/cache@v3
5757
id: actions-cache
5858
with:
5959
path: ${{ steps.composer-cache.outputs.dir }}

Diff for: .github/workflows/run-tests-postgres.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
operating-system: [ubuntu-latest]
32-
php-versions: [ '8.1', '8.0' ]
32+
php-versions: [ '8.2', '8.1' ]
3333
dependency-stability: [ prefer-stable ]
3434

3535
laravel: [ '10.*', '9.*']
@@ -45,24 +45,24 @@ jobs:
4545
name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
4646

4747
steps:
48-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v3
4949
- name: Install PHP versions
5050
uses: shivammathur/setup-php@v2
5151
with:
5252
php-version: ${{ matrix.php-versions }}
5353
- name: Get Composer Cache Directory 2
5454
id: composer-cache
5555
run: |
56-
echo "::set-output name=dir::$(composer config cache-files-dir)"
57-
- uses: actions/cache@v2
56+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
57+
- uses: actions/cache@v3
5858
id: actions-cache
5959
with:
6060
path: ${{ steps.composer-cache.outputs.dir }}
6161
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
6262
restore-keys: |
6363
${{ runner.os }}-composer-
6464
- name: Cache PHP dependencies
65-
uses: actions/cache@v2
65+
uses: actions/cache@v3
6666
id: vendor-cache
6767
with:
6868
path: vendor

Diff for: .github/workflows/run-tests.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
operating-system: [ubuntu-latest]
13-
php-versions: [ '8.1', '8.0', '7.4', '7.3', '7.2' ]
13+
php-versions: [ '8.2', '8.1', '8.0', '7.4', '7.3', '7.2' ]
1414
dependency-stability: [ prefer-stable ]
1515
laravel: [ '10.*', '9.*', '8.*', '7.*', '6.*' ]
1616

@@ -47,26 +47,30 @@ jobs:
4747
php-versions: 7.4
4848
- laravel: 8.*
4949
php-versions: 7.2
50+
- laravel: 7.*
51+
php-versions: 8.2
5052
- laravel: 7.*
5153
php-versions: 8.1
5254
- laravel: 7.*
5355
php-versions: 8.0
56+
- laravel: 6.*
57+
php-versions: 8.2
5458
- laravel: 6.*
5559
php-versions: 8.1
5660

5761
name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
5862

5963
steps:
60-
- uses: actions/checkout@v2
64+
- uses: actions/checkout@v3
6165
- name: Install PHP versions
6266
uses: shivammathur/setup-php@v2
6367
with:
6468
php-version: ${{ matrix.php-versions }}
6569
- name: Get Composer Cache Directory 2
6670
id: composer-cache
6771
run: |
68-
echo "::set-output name=dir::$(composer config cache-files-dir)"
69-
- uses: actions/cache@v2
72+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
73+
- uses: actions/cache@v3
7074
id: actions-cache
7175
with:
7276
path: ${{ steps.composer-cache.outputs.dir }}

Diff for: src/Models/Message.php

-7
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ class Message extends Eloquent
3636
*/
3737
protected $fillable = ['thread_id', 'user_id', 'body'];
3838

39-
/**
40-
* The attributes that should be mutated to date's.
41-
*
42-
* @var array
43-
*/
44-
protected $dates = ['deleted_at'];
45-
4639
/**
4740
* {@inheritDoc}
4841
*/

Diff for: src/Models/Participant.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ class Participant extends Eloquent
2525
protected $fillable = ['thread_id', 'user_id', 'last_read'];
2626

2727
/**
28-
* The attributes that should be mutated to date's.
28+
* The attributes that should be cast.
2929
*
3030
* @var array
3131
*/
32-
protected $dates = ['deleted_at', 'last_read'];
32+
protected $casts = ['last_read' => 'datetime'];
3333

3434
/**
3535
* {@inheritDoc}

Diff for: src/Models/Thread.php

-7
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ class Thread extends Eloquent
3535
*/
3636
protected $fillable = ['subject'];
3737

38-
/**
39-
* The attributes that should be mutated to date's.
40-
*
41-
* @var array
42-
*/
43-
protected $dates = ['deleted_at'];
44-
4538
/**
4639
* Internal cache for creator.
4740
*

0 commit comments

Comments
 (0)