Skip to content

Commit bb6943a

Browse files
committed
Merge branch 'main' into develop
2 parents 9657859 + 27da26f commit bb6943a

File tree

10 files changed

+27
-23
lines changed

10 files changed

+27
-23
lines changed

.github/workflows/build-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout Repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414

1515
- name: Setup PHP
1616
uses: shivammathur/setup-php@v2
1717
with:
18-
php-version: '7.4'
18+
php-version: '8.4'
1919

2020
- name: Install Dependencies
2121
run: composer install

.github/workflows/code-coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout Repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414

1515
- name: Setup PHP
1616
uses: shivammathur/setup-php@v2
1717
with:
18-
php-version: '7.4'
18+
php-version: '8.4'
1919

2020
- name: Install Dependencies
2121
run: composer install

.github/workflows/dependabot-auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v2.2.0
16+
uses: dependabot/fetch-metadata@v2.4.0
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

.github/workflows/fix-php-code-style-issues.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
with:
1919
ref: ${{ github.head_ref }}
2020

2121
- name: Fix PHP code style issues
22-
uses: aglipanci/laravel-pint-action@2.4
22+
uses: aglipanci/laravel-pint-action@2.6
2323

2424
- name: Commit changes
25-
uses: stefanzweifel/git-auto-commit-action@v5
25+
uses: stefanzweifel/git-auto-commit-action@v6
2626
with:
2727
commit_message: Fixed code styling

.github/workflows/phpstan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
name: phpstan
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: '8.3'
19+
php-version: '8.4'
2020
coverage: none
2121

2222
- name: Install composer dependencies

.github/workflows/run-tests.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,22 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest]
12-
php: [8.3, 8.2]
13-
laravel: [10.*, 11.*]
12+
php: [8.4, 8.3, 8.2]
13+
laravel: [10.*, 11.*, 12.*]
1414
stability: [prefer-lowest, prefer-stable]
1515
include:
1616
- laravel: 10.*
1717
testbench: 8.*
1818
- laravel: 11.*
1919
testbench: 9.*
20+
- laravel: 12.*
21+
testbench: 10.*
2022

2123
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2224

2325
steps:
2426
- name: Checkout code
25-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2628

2729
- name: Setup PHP
2830
uses: shivammathur/setup-php@v2

.github/workflows/update-changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
with:
1515
ref: main
1616

@@ -21,7 +21,7 @@ jobs:
2121
release-notes: ${{ github.event.release.body }}
2222

2323
- name: Commit updated CHANGELOG
24-
uses: stefanzweifel/git-auto-commit-action@v5
24+
uses: stefanzweifel/git-auto-commit-action@v6
2525
with:
2626
branch: main
2727
commit_message: Update CHANGELOG

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
}
2323
],
2424
"require": {
25-
"php": "^8.1",
26-
"illuminate/contracts": "^8.0|^9.0|^10.0|^11.0",
27-
"illuminate/support": "^9.0|^10.0|^11.0",
28-
"illuminate/queue": "^8.0|^9.0|^10.0|^11.0",
29-
"illuminate/bus": "^8.0|^9.0|^10.0|^11.0",
25+
"php": "^8.2",
26+
"illuminate/contracts": "^9.0|^10.0|^11.0|^12.0",
27+
"illuminate/support": "^9.0|^10.0|^11.0|^12.0",
28+
"illuminate/queue": "^9.0|^10.0|^11.0|^12.0",
29+
"illuminate/bus": "^9.0|^10.0|^11.0|^12.0",
3030
"aws/aws-sdk-php": "^3.250"
3131
},
3232
"require-dev": {
3333
"larastan/larastan": "^2.0",
3434
"laravel/pint": "^1.2",
3535
"nunomaduro/collision": "^6.3|^7.0|^8.1",
36-
"orchestra/testbench": "^7.15|^8.0|^9.0",
36+
"orchestra/testbench": "^7.15|^8.0|^9.0|^10.0",
3737
"phpstan/extension-installer": "^1.2",
3838
"phpstan/phpstan-deprecation-rules": "^1.0",
3939
"phpunit/phpunit": "^9.5|^10.0|^11.0"
@@ -75,4 +75,4 @@
7575
"url": "https://github.com/sponsors/palpalani"
7676
}
7777
]
78-
}
78+
}

pint.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"rules": {
44
"@PER-CS": true,
55
"@PER-CS:risky": true,
6+
"@PHP81Migration": true,
67
"@PHP82Migration": true,
8+
"@PHP83Migration": true,
79
"simplified_null_return": true,
810
"braces": false,
911
"new_with_braces": {

src/Sqs/Queue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Queue extends SqsQueue
2626
*
2727
* @throws JsonException
2828
*/
29-
protected function createPayload($job, $queue = null, $data = ''): string
29+
protected function createPayload($job, $queue = null, $data = '', $delay = null): string
3030
{
3131
if (! $job instanceof DispatcherJob) {
3232
return parent::createPayload($job, $queue, $data);

0 commit comments

Comments
 (0)