Skip to content

Commit d538728

Browse files
committed
Updated support for Laravel 5.5 and up
1 parent f57ecee commit d538728

File tree

3 files changed

+11
-42
lines changed

3 files changed

+11
-42
lines changed

.travis.yml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,10 @@ cache:
66
- $HOME/.composer/cache/files
77

88
php:
9-
- 5.5
10-
- 5.6
119
- 7.0
1210
- 7.1
1311

1412
env:
15-
- ILLUMINATE_VERSION=5.1.* PHPUNIT_VERSION=~4.0
16-
- ILLUMINATE_VERSION=5.2.* PHPUNIT_VERSION=~4.0
17-
- ILLUMINATE_VERSION=5.3.* PHPUNIT_VERSION=~5.0
18-
- ILLUMINATE_VERSION=5.4.* PHPUNIT_VERSION=~5.7
1913
- ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0
2014
- ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
2115
- ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
@@ -24,42 +18,13 @@ env:
2418
matrix:
2519
# For each PHP version we exclude the coverage env, except for PHP 7.1
2620
exclude:
27-
# Test only Laravel 5.1 and 5.2 on PHP 5.5
28-
- php: 5.5
29-
env: ILLUMINATE_VERSION=5.3.* PHPUNIT_VERSION=~5.0
30-
- php: 5.5
31-
env: ILLUMINATE_VERSION=5.4.* PHPUNIT_VERSION=~5.7
32-
- php: 5.5
33-
env: ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0
34-
- php: 5.5
35-
env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
36-
- php: 5.5
37-
env: ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
38-
- php: 5.5
39-
env: ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=^7.5 COVERAGE=true
40-
# Don't test Laravel 5.5 and up on PHP 5.6
41-
- php: 5.6
42-
env: ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0
43-
- php: 5.6
44-
env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
45-
- php: 5.6
46-
env: ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
47-
- php: 5.6
48-
env: ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=^7.5 COVERAGE=true
4921
# Test Laravel 5.5 and down on PHP 7.0
5022
- php: 7.0
5123
env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
5224
- php: 7.0
5325
env: ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
5426
- php: 7.0
5527
env: ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=^7.5 COVERAGE=true
56-
# Test only Laravel 5.4 and up on PHP 7.1
57-
- php: 7.1
58-
env: ILLUMINATE_VERSION=5.1.* PHPUNIT_VERSION=~4.0
59-
- php: 7.1
60-
env: ILLUMINATE_VERSION=5.2.* PHPUNIT_VERSION=~4.0
61-
- php: 7.1
62-
env: ILLUMINATE_VERSION=5.3.* PHPUNIT_VERSION=~5.0
6328

6429
before_install:
6530
- echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

Readme.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,20 @@ A simple localization package for Laravel 5. It provides URL detection, Route pa
1111

1212
#### Dependencies:
1313

14-
* [Laravel 5.x](https://github.com/laravel/laravel)
14+
##### Version prior to 3.0
15+
* [Laravel <= 5.7](https://github.com/laravel/laravel)
1516

1617

18+
##### Version 3.0 and up
19+
* [Laravel >= 5.5](https://github.com/laravel/laravel)
20+
1721
#### Installation:
1822

1923
**1-** Require the package via Composer in your `composer.json`.
2024
```json
2125
{
2226
"require": {
23-
"folklore/laravel-locale": "~2.2"
27+
"folklore/laravel-locale": "~3.0"
2428
}
2529
}
2630
```

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
"license": "MIT",
1919
"type": "project",
2020
"require": {
21-
"php": ">=5.5.9",
22-
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.7.*|5.8.*"
21+
"php": ">=7.0.0",
22+
"illuminate/support": "5.5.*|5.7.*|5.8.*"
2323
},
2424
"require-dev": {
2525
"fzaninotto/faker": "~1.4",
26-
"orchestra/testbench": "3.1.*|3.2.*|3.3.*|3.4.*|3.5.*|3.6.*|3.7.*|3.8.*",
27-
"mockery/mockery": "0.9.*|1.0.*",
28-
"phpunit/phpunit": "~4.0|~4.1|~5.4|~5.7|~6.0|~7.0|^7.5",
26+
"orchestra/testbench": "3.5.*|3.6.*|3.7.*|3.8.*",
27+
"mockery/mockery": "~1.0",
28+
"phpunit/phpunit": "~6.0|~7.0|^7.5",
2929
"php-coveralls/php-coveralls": "^2.1"
3030
},
3131
"autoload": {

0 commit comments

Comments
 (0)