Skip to content

Commit 712f9d4

Browse files
authored
Merge pull request #8 from RingierIMU/l9-compatibility-pr
Laravel 9 Compatibility
2 parents 86f8f08 + fe950cb commit 712f9d4

File tree

7 files changed

+80
-3386
lines changed

7 files changed

+80
-3386
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
/vendor
2-
/.idea
2+
/.idea
3+
composer.lock
4+
.phpunit.result.cache

.travis.yml

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,61 @@
11
language: php
22

33
os:
4-
# - windows
54
- linux
65

76
php:
87
- 5.6
9-
- 7.3
8+
- 7.4
9+
- 8.0
10+
- 8.1
1011

11-
script:
12-
- vendor/phpunit/phpunit/phpunit
12+
env:
13+
- TESTBENCH_VERSION=^3 PHPUNIT_VERSION=^5
14+
- TESTBENCH_VERSION=^4 PHPUNIT_VERSION=^8
15+
- TESTBENCH_VERSION=^5 PHPUNIT_VERSION=^8
16+
- TESTBENCH_VERSION=^6 PHPUNIT_VERSION=^8
17+
- TESTBENCH_VERSION=^7 PHPUNIT_VERSION=^9
18+
19+
matrix:
20+
exclude:
21+
- php: 5.6
22+
env: TESTBENCH_VERSION=^4 PHPUNIT_VERSION=^8
23+
- php: 5.6
24+
env: TESTBENCH_VERSION=^5 PHPUNIT_VERSION=^8
25+
- php: 5.6
26+
env: TESTBENCH_VERSION=^6 PHPUNIT_VERSION=^8
27+
- php: 5.6
28+
env: TESTBENCH_VERSION=^7 PHPUNIT_VERSION=^9
29+
- php: 7.4
30+
env: TESTBENCH_VERSION=^3 PHPUNIT_VERSION=^5
31+
- php: 7.4
32+
env: TESTBENCH_VERSION=^4 PHPUNIT_VERSION=^8
33+
- php: 7.4
34+
env: TESTBENCH_VERSION=^5 PHPUNIT_VERSION=^8
35+
- php: 7.4
36+
env: TESTBENCH_VERSION=^7 PHPUNIT_VERSION=^9
37+
- php: 8.0
38+
env: TESTBENCH_VERSION=^3 PHPUNIT_VERSION=^5
39+
- php: 8.0
40+
env: TESTBENCH_VERSION=^4 PHPUNIT_VERSION=^8
41+
- php: 8.0
42+
env: TESTBENCH_VERSION=^5 PHPUNIT_VERSION=^8
43+
- php: 8.1
44+
env: TESTBENCH_VERSION=^3 PHPUNIT_VERSION=^5
45+
- php: 8.1
46+
env: TESTBENCH_VERSION=^4 PHPUNIT_VERSION=^8
47+
- php: 8.1
48+
env: TESTBENCH_VERSION=^5 PHPUNIT_VERSION=^8
49+
- php: 8.1
50+
env: TESTBENCH_VERSION=^6 PHPUNIT_VERSION=^8
1351

1452
before_install:
1553
- composer self-update
54+
- composer require "orchestra/testbench:${TESTBENCH_VERSION}" --no-update --prefer-dist
55+
- composer require "phpunit/phpunit:${PHPUNIT_VERSION}" --no-update --prefer-dist
1656

1757
install:
18-
- composer install
58+
- travis_retry composer install --no-interaction --prefer-dist
59+
60+
script:
61+
- vendor/phpunit/phpunit/phpunit

composer.json

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
22
"name": "librenms/laravel-vue-i18n-generator",
3-
"license": "MIT",
43
"description": "Generates a vue-i18n compatible include file from your Laravel translations.",
5-
"keywords": ["laravel","vue-i18n"],
6-
"homepage": "http://github.com/librenms/laravel-vue-i18n-generator",
4+
"license": "MIT",
5+
"keywords": [
6+
"laravel",
7+
"vue-i18n"
8+
],
79
"authors": [
810
{
911
"name": "Martin Lindhe",
@@ -14,27 +16,38 @@
1416
"email": "[email protected]"
1517
}
1618
],
19+
"homepage": "http://github.com/librenms/laravel-vue-i18n-generator",
1720
"require": {
1821
"php": ">=5.5.0",
1922
"ext-json": "*",
2023
"ext-mbstring": "*",
21-
"illuminate/console": "^5.0|^6.0|^7.0|^8.0",
22-
"illuminate/support": "^5.0|^6.0|^7.0|^8.0"
24+
"illuminate/console": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
25+
"illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
2326
},
2427
"require-dev": {
25-
"phpunit/phpunit": "~4.7",
26-
"orchestra/testbench": "3.1.*"
28+
"orchestra/testbench": "^7",
29+
"phpunit/phpunit": "^9"
2730
},
2831
"autoload": {
2932
"psr-4": {
3033
"MartinLindhe\\VueInternationalizationGenerator\\": "src/"
3134
}
3235
},
36+
"config": {
37+
"allow-plugins": {
38+
"kylekatarnls/update-helper": true
39+
}
40+
},
3341
"extra": {
3442
"laravel": {
3543
"providers": [
3644
"MartinLindhe\\VueInternationalizationGenerator\\GeneratorProvider"
3745
]
3846
}
47+
},
48+
"scripts": {
49+
"post-autoload-dump": [
50+
"@php ./vendor/bin/testbench package:discover --ansi"
51+
]
3952
}
4053
}

0 commit comments

Comments
 (0)