Skip to content

Commit

Permalink
Merge branch 'master' into v2
Browse files Browse the repository at this point in the history
  • Loading branch information
cmgmyr committed Mar 31, 2023
2 parents 0a74f94 + 1ae9999 commit 70a7fc1
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ contact_links:
about: Learn how to notify us for sensitive bugs
- name: Report a bug
url: https://github.com/cmgmyr/laravel-messenger/issues/new
about: Report a reproducable bug
about: Report a reproducible bug
2 changes: 1 addition & 1 deletion .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/run-tests-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest]
php-versions: [ '8.1', '8.0' ]
php-versions: [ '8.2', '8.1' ]
dependency-stability: [ prefer-stable ]

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

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install PHP versions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
- name: Get Composer Cache Directory 2
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v2
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
id: actions-cache
with:
path: ${{ steps.composer-cache.outputs.dir }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/run-tests-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest]
php-versions: [ '8.1', '8.0' ]
php-versions: [ '8.2', '8.1' ]
dependency-stability: [ prefer-stable ]

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

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install PHP versions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
- name: Get Composer Cache Directory 2
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v2
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
id: actions-cache
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- name: Cache PHP dependencies
uses: actions/cache@v2
uses: actions/cache@v3
id: vendor-cache
with:
path: vendor
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest]
php-versions: [ '8.1', '8.0', '7.4', '7.3', '7.2' ]
php-versions: [ '8.2', '8.1', '8.0', '7.4', '7.3', '7.2' ]
dependency-stability: [ prefer-stable ]
laravel: [ '10.*', '9.*', '8.*', '7.*', '6.*' ]

Expand Down Expand Up @@ -47,26 +47,30 @@ jobs:
php-versions: 7.4
- laravel: 8.*
php-versions: 7.2
- laravel: 7.*
php-versions: 8.2
- laravel: 7.*
php-versions: 8.1
- laravel: 7.*
php-versions: 8.0
- laravel: 6.*
php-versions: 8.2
- laravel: 6.*
php-versions: 8.1

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

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install PHP versions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
- name: Get Composer Cache Directory 2
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v2
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
id: actions-cache
with:
path: ${{ steps.composer-cache.outputs.dir }}
Expand Down
7 changes: 0 additions & 7 deletions src/Models/Message.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,6 @@ class Message extends Eloquent
*/
protected $fillable = ['thread_id', 'user_id', 'body'];

/**
* The attributes that should be mutated to date's.
*
* @var array
*/
protected $dates = ['deleted_at'];

/**
* {@inheritDoc}
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Models/Participant.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ class Participant extends Eloquent
protected $fillable = ['thread_id', 'user_id', 'last_read'];

/**
* The attributes that should be mutated to date's.
* The attributes that should be cast.
*
* @var array
*/
protected $dates = ['deleted_at', 'last_read'];
protected $casts = ['last_read' => 'datetime'];

/**
* {@inheritDoc}
Expand Down
7 changes: 0 additions & 7 deletions src/Models/Thread.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ class Thread extends Eloquent
*/
protected $fillable = ['subject'];

/**
* The attributes that should be mutated to date's.
*
* @var array
*/
protected $dates = ['deleted_at'];

/**
* Internal cache for creator.
*
Expand Down

0 comments on commit 70a7fc1

Please sign in to comment.