Skip to content

Commit

Permalink
Merge pull request #30 from ARCANEDEV/update-laravel_6.0_support
Browse files Browse the repository at this point in the history
Adding Laravel 6.0 support
  • Loading branch information
arcanedev-maroc authored Sep 9, 2019
2 parents f422386 + 6120844 commit dd0acb1
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ checks:
tools:
external_code_coverage:
timeout: 600
runs: 4
runs: 2
php_code_sniffer:
enabled: true
config:
Expand Down
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: php

php:
- 7.1.3
- 7.1
- 7.2
- 7.3
- nightly
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# LaravelLang [![Packagist License][badge_license]](LICENSE.md) [![For Laravel 5][badge_laravel]][link-github-repo]
# LaravelLang [![Packagist License][badge_license]](LICENSE.md) [![For Laravel][badge_laravel]][link-github-repo]

[![Travis Status][badge_build]][link-travis]
[![Coverage Status][badge_coverage]][link-scrutinizer]
Expand All @@ -21,7 +21,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LaravelLang/r
* Easy setup & configuration.
* Missing translations Checker.
* Translations Publisher.
* Laravel `5.0` to `5.8` are supported.
* Laravel `5.0` to `6.0` are supported.
* Well documented & IDE Friendly.
* Well tested with maximum code quality.
* Made with :heart: & :coffee:.
Expand Down Expand Up @@ -50,7 +50,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
- [All Contributors][link-contributors]

[badge_license]: https://img.shields.io/packagist/l/arcanedev/laravel-lang.svg?style=flat-square
[badge_laravel]: https://img.shields.io/badge/Laravel-From%205.0%20to%205.8-orange.svg?style=flat-square
[badge_laravel]: https://img.shields.io/badge/Laravel-From%205.0%20to%206.0-orange.svg?style=flat-square
[badge_build]: https://img.shields.io/travis/ARCANEDEV/LaravelLang.svg?style=flat-square
[badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelLang.svg?style=flat-square
[badge_quality]: https://img.shields.io/scrutinizer/g/ARCANEDEV/LaravelLang.svg?style=flat-square
Expand Down
2 changes: 1 addition & 1 deletion _docs/0-Home.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Translations manager and checker for Laravel 5 based on [caouecs/Laravel-lang](h
* Easy setup & configuration.
* Missing translations Checker.
* Translations Publisher.
* Laravel `5.0` to `5.8` are supported.
* Laravel `5.0` to `6.0` are supported.
* Well documented & IDE Friendly.
* Well tested with maximum code quality.
* Made with :heart: & :coffee:.
Expand Down
11 changes: 3 additions & 8 deletions _docs/1-Installation-and-Setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
2. [Configuration](2-Configuration.md)
3. [Usage](3-Usage.md)

## Server Requirements

The LaravelLang package has a few system requirements:

```
- PHP >= 7.1.3
```

## Version Compatibility

| LaravelLang | Laravel |
Expand All @@ -24,6 +16,7 @@ The LaravelLang package has a few system requirements:
| ![LaravelLang v4.x][laravel_lang_4_x] | ![Laravel v5.6][laravel_5_6] |
| ![LaravelLang v5.x][laravel_lang_5_x] | ![Laravel v5.7][laravel_5_7] |
| ![LaravelLang v6.x][laravel_lang_6_x] | ![Laravel v5.8][laravel_5_8] |
| ![LaravelLang v7.x][laravel_lang_7_x] | ![Laravel v6.0][laravel_6_0] |

[laravel_5_0]: https://img.shields.io/badge/v5.0-supported-brightgreen.svg?style=flat-square "Laravel v5.0"
[laravel_5_1]: https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1"
Expand All @@ -34,13 +27,15 @@ The LaravelLang package has a few system requirements:
[laravel_5_6]: https://img.shields.io/badge/v5.6-supported-brightgreen.svg?style=flat-square "Laravel v5.6"
[laravel_5_7]: https://img.shields.io/badge/v5.7-supported-brightgreen.svg?style=flat-square "Laravel v5.7"
[laravel_5_8]: https://img.shields.io/badge/v5.8-supported-brightgreen.svg?style=flat-square "Laravel v5.8"
[laravel_6_0]: https://img.shields.io/badge/v6.0-supported-brightgreen.svg?style=flat-square "Laravel v6.0"

[laravel_lang_1_x]: https://img.shields.io/badge/version-1.*-blue.svg?style=flat-square "LaravelLang v1.*"
[laravel_lang_2_x]: https://img.shields.io/badge/version-2.*-blue.svg?style=flat-square "LaravelLang v2.*"
[laravel_lang_3_x]: https://img.shields.io/badge/version-3.*-blue.svg?style=flat-square "LaravelLang v3.*"
[laravel_lang_4_x]: https://img.shields.io/badge/version-4.*-blue.svg?style=flat-square "LaravelLang v4.*"
[laravel_lang_5_x]: https://img.shields.io/badge/version-5.*-blue.svg?style=flat-square "LaravelLang v5.*"
[laravel_lang_6_x]: https://img.shields.io/badge/version-6.*-blue.svg?style=flat-square "LaravelLang v6.*"
[laravel_lang_7_x]: https://img.shields.io/badge/version-7.*-blue.svg?style=flat-square "LaravelLang v7.*"

## Composer

Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
"type": "library",
"license": "MIT",
"require": {
"php": ">=7.1.3",
"arcanedev/support": "~4.5.0",
"php": ">=7.2.0",
"arcanedev/support": "~5.0.0",
"caouecs/laravel-lang": "~4.0"
},
"require-dev": {
"orchestra/testbench": "~3.8.0",
"phpunit/phpcov": "~5.0|~6.0",
"phpunit/phpunit": "~7.0|~8.0",
"mockery/mockery": "~1.1"
"orchestra/testbench": "~4.0.0",
"phpunit/phpcov": "~6.0",
"phpunit/phpunit": "~8.0",
"mockery/mockery": "~1.2"
},
"autoload": {
"psr-4": {
Expand Down
7 changes: 4 additions & 3 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ abstract class TestCase extends BaseTestCase
*/
protected $locales = [
'ar', 'az', 'be', 'bg', 'bn', 'bs', 'ca', 'cs', 'cy', 'da', 'de', 'de-CH', 'el', 'es', 'et', 'eu', 'fa', 'fi',
'fr', 'gl', 'he', 'hi', 'hr', 'hu', 'id', 'is', 'it', 'ja', 'ka', 'kk', 'km', 'kn', 'ko', 'lt', 'lv', 'me', 'mk',
'mn', 'ms', 'nb', 'ne', 'nl', 'nn', 'pl', 'pt', 'pt-BR', 'ro', 'ru', 'sc', 'sk', 'sl', 'sq', 'sr', 'sv', 'sw',
'tg', 'th', 'tk', 'tl', 'tr', 'ug', 'uk', 'ur', 'uz-cyrillic', 'uz-latin', 'vi', 'zh-CN', 'zh-HK', 'zh-TW',
'fil', 'fr', 'gl', 'he', 'hi', 'hr', 'hu', 'id', 'is', 'it', 'ja', 'ka', 'kk', 'km', 'kn', 'ko', 'lt', 'lv',
'me', 'mk', 'mn', 'mr', 'ms', 'nb', 'ne', 'nl', 'nn', 'pl', 'ps', 'pt', 'pt-BR', 'ro', 'ru', 'sc', 'si', 'sk',
'sl', 'sq', 'sr', 'sv', 'sw', 'tg', 'th', 'tk', 'tl', 'tr', 'ug', 'uk', 'ur', 'uz-cyrillic', 'uz-latin', 'vi',
'zh-CN', 'zh-HK', 'zh-TW',
];

/* -----------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/lang/en/validation.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
'digits_between' => 'The :attribute must be between :min and :max digits.',
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
'ends_with' => 'The :attribute must end with one of the following: :values',
'email' => 'The :attribute must be a valid email address.',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
Expand Down

0 comments on commit dd0acb1

Please sign in to comment.