Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ jobs:
fail-fast: true
matrix:
php: [ 8.0, 8.1 ]
laravel: [ 8.*, 9.* ]
laravel: [ 8.*, 9.*, 10.* ]
dependency-version: [ prefer-stable ]
exclude:
- laravel: 10.*
php: 8.0
include:
- laravel: 5.6.*
php: 7.1
Expand Down Expand Up @@ -40,6 +43,8 @@ jobs:
testbench: 6.*
- laravel: 9.*
testbench: 7.*
- laravel: 10.*
testbench: 8.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ I know you can get punished for this, but you are one of the hopes of those inno
---

[![GitHub release](https://img.shields.io/github/release/codezero-be/laravel-localizer.svg?style=flat-square)](https://github.com/codezero-be/laravel-localizer/releases)
[![Laravel](https://img.shields.io/badge/laravel-9-red?style=flat-square&logo=laravel&logoColor=white)](https://laravel.com)
[![Laravel](https://img.shields.io/badge/laravel-10-red?style=flat-square&logo=laravel&logoColor=white)](https://laravel.com)
[![License](https://img.shields.io/packagist/l/codezero/laravel-localizer.svg?style=flat-square)](LICENSE.md)
[![Build Status](https://img.shields.io/github/workflow/status/codezero-be/laravel-localizer/Tests/master?style=flat-square&logo=github&logoColor=white&label=tests)](https://github.com/codezero-be/laravel-localizer/actions)
[![Build Status](https://img.shields.io/github/actions/workflow/status/codezero-be/laravel-localizer/run-tests.yml?style=flat-square&logo=github&logoColor=white&label=tests)](https://github.com/codezero-be/laravel-localized-routes/actions)
[![Code Coverage](https://img.shields.io/codacy/coverage/ad6fcea152b449d380a187a375d0f7d7/master?style=flat-square)](https://app.codacy.com/gh/codezero-be/laravel-localizer)
[![Code Quality](https://img.shields.io/codacy/grade/ad6fcea152b449d380a187a375d0f7d7/master?style=flat-square)](https://app.codacy.com/gh/codezero-be/laravel-localizer)
[![Total Downloads](https://img.shields.io/packagist/dt/codezero/laravel-localizer.svg?style=flat-square)](https://packagist.org/packages/codezero/laravel-localizer)
Expand Down
9 changes: 6 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"require": {
"php": "^7.1|^8.0",
"codezero/browser-locale": "^3.0",
"illuminate/support": "^5.6|^6.0|^7.0|^8.0|^9.0"
"illuminate/support": "^5.6|^6.0|^7.0|^8.0|^9.0|^10.0"
},
"require-dev": {
"mockery/mockery": "^1.3.3",
"orchestra/testbench": "^3.6|^4.0|^5.0|^6.0|^7.0",
"orchestra/testbench": "^3.6|^4.0|^5.0|^6.0|^7.0|^8.0",
"phpunit/phpunit": "^7.0|^8.0|^9.0"
},
"scripts": {
Expand All @@ -53,7 +53,10 @@
"config": {
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
"optimize-autoloader": true,
"allow-plugins": {
"kylekatarnls/update-helper": true
}
},
"minimum-stability": "dev",
"prefer-stable": true
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/SetLocaleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ protected function setBrowserLocales($locales)
*/
protected function getWithCookie($url, $cookie)
{
return App::version() < 6
return version_compare(App::version(), '6.0.0') === -1
? $this->call('GET', $url, [], [$this->cookieName => Crypt::encrypt($cookie, false)])
: $this->withCookie($this->cookieName, $cookie)->get($url);
}
Expand Down