Skip to content

Commit

Permalink
Merge branch '3.x' into feature/user-preffered-locale-hook
Browse files Browse the repository at this point in the history
  • Loading branch information
bezhanSalleh committed Apr 1, 2024
2 parents 484bf38 + 79e3657 commit bdfc82d
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.6.0
uses: dependabot/fetch-metadata@v2.0.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

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 @@ -12,13 +12,17 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.1, 8.2]
laravel: [10.*]
stability: [prefer-lowest, prefer-stable]
php: [8.3, 8.2, 8.1]
laravel: [11.*, 10.*]
dependency-version: [prefer-stable]
include:
- laravel: 11.*
testbench: 9.*
- laravel: 10.*
testbench: 8.*
exclude:
- laravel: 11.*
php: 8.1

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

Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

All notable changes to `filament-language-switch` will be documented in this file.

## 3.0.6 - 2024-03-28

### What's Changed

* Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 by @dependabot in https://github.com/bezhanSalleh/filament-language-switch/pull/85
* remove laravel explicit version dependency by @bezhanSalleh in https://github.com/bezhanSalleh/filament-language-switch/pull/86

**Full Changelog**: https://github.com/bezhanSalleh/filament-language-switch/compare/3.0.5...3.0.6

## 3.0.5 - 2024-01-25

### What's Changed

* fix middleware return type by @bezhanSalleh in https://github.com/bezhanSalleh/filament-language-switch/pull/80

**Full Changelog**: https://github.com/bezhanSalleh/filament-language-switch/compare/3.0.4...3.0.5

## 3.0.4 - 2024-01-12

### What's Changed
Expand Down
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@
}
],
"require": {
"php": "^8.1|^8.2",
"php": "^8.1|^8.2|^8.3",
"filament/filament": "^3.0",
"spatie/laravel-package-tools": "^1.9",
"illuminate/contracts": "^9.0|^10.0"
"spatie/laravel-package-tools": "^1.9"
},
"require-dev": {
"laravel/pint": "^1.0",
"nunomaduro/collision": "^6.0|^7.0",
"orchestra/testbench": "^7.0|^8.0",
"pestphp/pest": "^1.21",
"pestphp/pest-plugin-laravel": "^1.1",
"nunomaduro/collision": "^6.0|^7.0|8.0",
"orchestra/testbench": "^7.0|^8.0|^9.0",
"pestphp/pest": "^2.34",
"pestphp/pest-plugin-laravel": "^2.3",
"spatie/laravel-ray": "^1.26"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Middleware/SwitchLanguageLocale.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class SwitchLanguageLocale
{
public function handle(Request $request, Closure $next): \Illuminate\Http\Response | \Illuminate\Http\RedirectResponse
public function handle(Request $request, Closure $next): mixed
{
app()->setLocale(
locale: LanguageSwitch::make()->getPreferredLocale()
Expand Down

0 comments on commit bdfc82d

Please sign in to comment.