Skip to content

Commit ae67e68

Browse files
authored
Merge pull request #11 from worksome/feature/laravel-11
feat: add support for Laravel 11
2 parents b337a53 + 28f421e commit ae67e68

File tree

6 files changed

+24
-33
lines changed

6 files changed

+24
-33
lines changed
+7-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Dependabot
1+
name: Dependabot Auto-Merge
22
on: pull_request_target
33

44
permissions:
@@ -7,7 +7,6 @@ permissions:
77

88
jobs:
99
dependabot:
10-
name: Auto Merge
1110
runs-on: ubuntu-latest
1211
if: ${{ github.actor == 'dependabot[bot]' }}
1312
steps:
@@ -19,15 +18,15 @@ jobs:
1918
github-token: "${{ secrets.GITHUB_TOKEN }}"
2019

2120
- name: Auto-merge Dependabot PRs for semver-minor updates
22-
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
21+
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' }}
2322
run: gh pr merge --auto --merge "$PR_URL"
2423
env:
25-
PR_URL: ${{github.event.pull_request.html_url}}
26-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
24+
PR_URL: ${{ github.event.pull_request.html_url }}
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2726

2827
- name: Auto-merge Dependabot PRs for semver-patch updates
29-
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
28+
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
3029
run: gh pr merge --auto --merge "$PR_URL"
3130
env:
32-
PR_URL: ${{github.event.pull_request.html_url}}
33-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
31+
PR_URL: ${{ github.event.pull_request.html_url }}
32+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/phpstan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: Setup PHP
1818
uses: shivammathur/setup-php@v2

.github/workflows/run-tests.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ on:
99
jobs:
1010
test:
1111
runs-on: ${{ matrix.os }}
12-
env:
13-
PREVENT_OUTPUT: true
1412
strategy:
1513
fail-fast: true
1614
matrix:
1715
os: [ubuntu-latest, windows-latest]
18-
php: [8.2]
19-
laravel: [10.*]
16+
php: [8.2, 8.3]
17+
laravel: [10.*, 11.*]
2018
stability: [prefer-lowest, prefer-stable]
2119
include:
2220
- laravel: 10.*
2321
testbench: 8.*
22+
- laravel: 11.*
23+
testbench: 9.*
2424

2525
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2626

2727
steps:
2828
- name: Checkout code
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030

3131
- name: Setup PHP
3232
uses: shivammathur/setup-php@v2

composer.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
],
1818
"require": {
1919
"php": "^8.2",
20-
"google/cloud-translate": "^1.12",
21-
"illuminate/support": "^10.0",
22-
"spatie/laravel-package-tools": "^1.14.1"
20+
"google/cloud-translate": "^1.17",
21+
"illuminate/support": "^10.0 || ^11.0",
22+
"spatie/laravel-package-tools": "^1.16"
2323
},
2424
"require-dev": {
25-
"guzzlehttp/guzzle": "^7.5",
26-
"nunomaduro/collision": "^7.0",
27-
"nunomaduro/larastan": "^2.4",
28-
"orchestra/testbench": "^8.0",
29-
"pestphp/pest": "^2.0",
30-
"pestphp/pest-plugin-laravel": "^2.0",
31-
"worksome/coding-style": "^2.5"
25+
"guzzlehttp/guzzle": "^7.8",
26+
"nunomaduro/collision": "^7.0 || ^8.1",
27+
"larastan/larastan": "^2.6",
28+
"orchestra/testbench": "^8.0 || ^9.0",
29+
"pestphp/pest": "^2.33",
30+
"pestphp/pest-plugin-laravel": "^2.2",
31+
"worksome/coding-style": "^2.8"
3232
},
3333
"autoload": {
3434
"psr-4": {

renovate.json

-9
This file was deleted.

src/Facades/Translator.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
/**
1212
* @see Factory
13+
*
1314
* @mixin TranslatorContract
1415
*/
1516
class Translator extends Facade

0 commit comments

Comments
 (0)