Skip to content

Commit 76026e0

Browse files
pascalbaljetpascalbaljet
authored
Tests refactor, support for newer Laravel and PHP versions (#146)
* Tests refactor, support for newer Laravel and PHP versions * Update .travis.yml * Update phpunit.xml Co-authored-by: Pascal Baljet <pascal@protone.media>
1 parent 3a0b7f6 commit 76026e0

24 files changed

+318
-10707
lines changed

‎.travis.yml‎

Lines changed: 200 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,205 @@
1+
cache:
2+
directories:
3+
- $HOME/.composer/cache
4+
15
dist: trusty
26
language: php
37

4-
php:
5-
- '5.5'
6-
- '5.6'
7-
- '7.0'
8-
- '7.1'
9-
- '7.2'
10-
- '7.3'
8+
matrix:
9+
include:
10+
- php: 5.4
11+
dist: trusty
12+
env: LARAVEL='4.2.*' TESTBENCH='2.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
13+
- php: 5.4
14+
dist: trusty
15+
env: LARAVEL='4.2.*' TESTBENCH='2.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
16+
- php: 5.5
17+
dist: trusty
18+
env: LARAVEL='4.2.*' TESTBENCH='2.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
19+
- php: 5.5
20+
dist: trusty
21+
env: LARAVEL='4.2.*' TESTBENCH='2.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
22+
- php: 5.6
23+
env: LARAVEL='4.2.*' TESTBENCH='2.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
24+
- php: 5.6
25+
env: LARAVEL='4.2.*' TESTBENCH='2.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
1126

12-
# Optimize the build since we are `composer installing` for each supported
13-
# Laravel versions (see composer.json, under scripts sections).
14-
cache:
15-
directories:
16-
- $HOME/.composer/cache
27+
- php: 5.4
28+
dist: trusty
29+
env: LARAVEL='5.0.*' TESTBENCH='3.0.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
30+
- php: 5.4
31+
dist: trusty
32+
env: LARAVEL='5.0.*' TESTBENCH='3.0.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
33+
- php: 5.5
34+
dist: trusty
35+
env: LARAVEL='5.0.*' TESTBENCH='3.0.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
36+
- php: 5.5
37+
dist: trusty
38+
env: LARAVEL='5.0.*' TESTBENCH='3.0.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
39+
- php: 5.6
40+
env: LARAVEL='5.0.*' TESTBENCH='3.0.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
41+
- php: 5.6
42+
env: LARAVEL='5.0.*' TESTBENCH='3.0.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
43+
44+
- php: 5.5
45+
dist: trusty
46+
env: LARAVEL='5.1.*' TESTBENCH='3.1.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
47+
- php: 5.5
48+
dist: trusty
49+
env: LARAVEL='5.1.*' TESTBENCH='3.1.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
50+
- php: 5.6
51+
env: LARAVEL='5.1.*' TESTBENCH='3.1.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
52+
- php: 5.6
53+
env: LARAVEL='5.1.*' TESTBENCH='3.1.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
54+
- php: 7.0
55+
env: LARAVEL='5.1.*' TESTBENCH='3.1.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
56+
- php: 7.0
57+
env: LARAVEL='5.1.*' TESTBENCH='3.1.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
58+
- php: 7.1
59+
env: LARAVEL='5.1.*' TESTBENCH='3.1.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
60+
- php: 7.1
61+
env: LARAVEL='5.1.*' TESTBENCH='3.1.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
62+
63+
- php: 5.5
64+
dist: trusty
65+
env: LARAVEL='5.2.*' TESTBENCH='3.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
66+
- php: 5.5
67+
dist: trusty
68+
env: LARAVEL='5.2.*' TESTBENCH='3.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
69+
- php: 5.6
70+
env: LARAVEL='5.2.*' TESTBENCH='3.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
71+
- php: 5.6
72+
env: LARAVEL='5.2.*' TESTBENCH='3.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
73+
- php: 7.0
74+
env: LARAVEL='5.2.*' TESTBENCH='3.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
75+
- php: 7.0
76+
env: LARAVEL='5.2.*' TESTBENCH='3.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
77+
- php: 7.1
78+
env: LARAVEL='5.2.*' TESTBENCH='3.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
79+
- php: 7.1
80+
env: LARAVEL='5.2.*' TESTBENCH='3.2.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
81+
82+
- php: 5.6
83+
env: LARAVEL='5.3.*' TESTBENCH='3.3.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
84+
- php: 5.6
85+
env: LARAVEL='5.3.*' TESTBENCH='3.3.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
86+
- php: 7.0
87+
env: LARAVEL='5.3.*' TESTBENCH='3.3.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
88+
- php: 7.0
89+
env: LARAVEL='5.3.*' TESTBENCH='3.3.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
90+
- php: 7.1
91+
env: LARAVEL='5.3.*' TESTBENCH='3.3.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-lowest'
92+
- php: 7.1
93+
env: LARAVEL='5.3.*' TESTBENCH='3.3.*' PHPUNIT='<6' COMPOSER_FLAGS='--prefer-stable'
94+
95+
- php: 5.6
96+
env: LARAVEL='5.4.*' TESTBENCH='^3.4.2' PHPUNIT='>=5.7' COMPOSER_FLAGS='--prefer-lowest'
97+
- php: 5.6
98+
env: LARAVEL='5.4.*' TESTBENCH='^3.4.2' PHPUNIT='>=5.7' COMPOSER_FLAGS='--prefer-stable'
99+
- php: 7.0
100+
env: LARAVEL='5.4.*' TESTBENCH='^3.4.2' PHPUNIT='>=5.7' COMPOSER_FLAGS='--prefer-lowest'
101+
- php: 7.0
102+
env: LARAVEL='5.4.*' TESTBENCH='^3.4.2' PHPUNIT='>=5.7' COMPOSER_FLAGS='--prefer-stable'
103+
- php: 7.1
104+
env: LARAVEL='5.4.*' TESTBENCH='^3.4.2' PHPUNIT='>=5.7' COMPOSER_FLAGS='--prefer-lowest'
105+
- php: 7.1
106+
env: LARAVEL='5.4.*' TESTBENCH='^3.4.2' PHPUNIT='>=5.7' COMPOSER_FLAGS='--prefer-stable'
107+
- php: 7.2
108+
env: LARAVEL='5.4.*' TESTBENCH='^3.4.2' PHPUNIT='>=6 <8' COMPOSER_FLAGS='--prefer-lowest'
109+
- php: 7.2
110+
env: LARAVEL='5.4.*' TESTBENCH='^3.4.2' PHPUNIT='>=6 <8' COMPOSER_FLAGS='--prefer-stable'
111+
112+
- php: 7.0
113+
env: LARAVEL='5.5.*' TESTBENCH='^3.5.5' PHPUNIT='>=6.5' COMPOSER_FLAGS='--prefer-lowest'
114+
- php: 7.0
115+
env: LARAVEL='5.5.*' TESTBENCH='^3.5.5' PHPUNIT='>=6.5' COMPOSER_FLAGS='--prefer-stable'
116+
- php: 7.1
117+
env: LARAVEL='5.5.*' TESTBENCH='^3.5.5' PHPUNIT='>=6.5' COMPOSER_FLAGS='--prefer-lowest'
118+
- php: 7.1
119+
env: LARAVEL='5.5.*' TESTBENCH='^3.5.5' PHPUNIT='>=6.5' COMPOSER_FLAGS='--prefer-stable'
120+
- php: 7.2
121+
env: LARAVEL='5.5.*' TESTBENCH='^3.5.5' PHPUNIT='>=6.5' COMPOSER_FLAGS='--prefer-lowest'
122+
- php: 7.2
123+
env: LARAVEL='5.5.*' TESTBENCH='^3.5.5' PHPUNIT='>=6.5' COMPOSER_FLAGS='--prefer-stable'
124+
- php: 7.3
125+
env: LARAVEL='5.5.*' TESTBENCH='^3.5.5' PHPUNIT='>=6.5' COMPOSER_FLAGS='--prefer-lowest'
126+
- php: 7.3
127+
env: LARAVEL='5.5.*' TESTBENCH='^3.5.5' PHPUNIT='>=6.5' COMPOSER_FLAGS='--prefer-stable'
128+
129+
- php: 7.1
130+
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
131+
- php: 7.1
132+
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
133+
- php: 7.2
134+
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
135+
- php: 7.2
136+
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
137+
138+
- php: 7.1
139+
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
140+
- php: 7.1
141+
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
142+
- php: 7.2
143+
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
144+
- php: 7.2
145+
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
146+
- php: 7.3
147+
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
148+
- php: 7.3
149+
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
150+
151+
- php: 7.1
152+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
153+
- php: 7.1
154+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
155+
- php: 7.2
156+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
157+
- php: 7.2
158+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
159+
- php: 7.3
160+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
161+
- php: 7.3
162+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
163+
- php: 7.4
164+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
165+
- php: 7.4
166+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
167+
168+
- php: 7.2
169+
env: LARAVEL='6.*' TESTBENCH='4.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
170+
- php: 7.2
171+
env: LARAVEL='6.*' TESTBENCH='4.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
172+
- php: 7.3
173+
env: LARAVEL='6.*' TESTBENCH='4.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
174+
- php: 7.3
175+
env: LARAVEL='6.*' TESTBENCH='4.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
176+
- php: 7.4
177+
env: LARAVEL='6.*' TESTBENCH='4.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
178+
- php: 7.4
179+
env: LARAVEL='6.*' TESTBENCH='4.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
180+
181+
- php: 7.2
182+
env: LARAVEL='7.*' TESTBENCH='5.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
183+
- php: 7.2
184+
env: LARAVEL='7.*' TESTBENCH='5.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
185+
- php: 7.3
186+
env: LARAVEL='7.*' TESTBENCH='5.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
187+
- php: 7.3
188+
env: LARAVEL='7.*' TESTBENCH='5.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
189+
- php: 7.4
190+
env: LARAVEL='7.*' TESTBENCH='5.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-lowest'
191+
- php: 7.4
192+
env: LARAVEL='7.*' TESTBENCH='5.*' PHPUNIT='>=6' COMPOSER_FLAGS='--prefer-stable'
193+
fast_finish: true
194+
195+
before_install:
196+
- export COMPOSER_MEMORY_LIMIT=-1
197+
- composer config discard-changes true
198+
- travis_retry composer self-update
199+
- travis_retry composer require "laravel/framework:${LARAVEL}" "phpunit/phpunit:${PHPUNIT}" "orchestra/testbench:${TESTBENCH}" --no-interaction --no-update
200+
201+
install:
202+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction --no-suggest
17203

18-
before_script:
19-
- composer self-update
20-
# Installing `Laravel-JS-Localization` package dependencies. If the current
21-
# PHP version is 5.5 then we should require minimum supported illuminate
22-
# dependencies.
23-
- if [[ `php -v` =~ "PHP 5.5" ]]; then composer require "illuminate/config:4.2.*" "illuminate/console:4.2.*" "illuminate/filesystem:4.2.*"; fi
24-
- if [[ `php -v` =~ "PHP 7.2" || `php -v` =~ "PHP 7.3" ]]; then yes | pecl install mcrypt-1.0.2; fi
25-
- composer install --prefer-dist --no-interaction
26-
# Installing `Laravel-JS-Localization` package dependencies for each
27-
# supported Laravel versions (see composer.json, under scripts section).
28-
- composer test-install
29-
30-
script: composer test
204+
script:
205+
- vendor/bin/phpunit

‎composer.json‎

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,65 @@
22
"name": "mariuzzo/laravel-js-localization",
33
"description": "Laravel Localization in JavaScript",
44
"type": "library",
5-
"keywords": ["laravel", "laravel 5", "localization", "i18n", "javascript", "js", "lang"],
5+
"keywords": [
6+
"laravel",
7+
"laravel 5",
8+
"localization",
9+
"i18n",
10+
"javascript",
11+
"js",
12+
"lang"
13+
],
614
"homepage": "https://github.com/rmariuzzo/laravel-js-localization",
715
"license": "MIT",
8-
"authors": [{
9-
"name": "Rubens Mariuzzo",
10-
"email": "rubens@mariuzzo.com",
11-
"homepage": "https://github.com/rmariuzzo",
12-
"role": "Developer"
13-
}, {
14-
"name": "German Popoter",
15-
"email": "me@gpopoteur.com",
16-
"homepage": "https://github.com/gpopoteur",
17-
"role": "Developer"
18-
}, {
19-
"name": "Galievskiy Dmitriy",
20-
"homepage": "https://github.com/xAockd",
21-
"role": "Developer"
22-
}, {
23-
"name": "Ramon Ackermann",
24-
"homepage": "https://github.com/sboo",
25-
"role": "Developer"
26-
}, {
27-
"name": "Anton Komarev",
28-
"homepage": "https://github.com/antonkomarev",
29-
"role": "Developer"
30-
}],
16+
"authors": [
17+
{
18+
"name": "Rubens Mariuzzo",
19+
"email": "rubens@mariuzzo.com",
20+
"homepage": "https://github.com/rmariuzzo",
21+
"role": "Developer"
22+
},
23+
{
24+
"name": "German Popoter",
25+
"email": "me@gpopoteur.com",
26+
"homepage": "https://github.com/gpopoteur",
27+
"role": "Developer"
28+
},
29+
{
30+
"name": "Galievskiy Dmitriy",
31+
"homepage": "https://github.com/xAockd",
32+
"role": "Developer"
33+
},
34+
{
35+
"name": "Ramon Ackermann",
36+
"homepage": "https://github.com/sboo",
37+
"role": "Developer"
38+
},
39+
{
40+
"name": "Anton Komarev",
41+
"homepage": "https://github.com/antonkomarev",
42+
"role": "Developer"
43+
},
44+
{
45+
"name": "Pascal Baljet",
46+
"homepage": "https://github.com/pascalbaljetmedia",
47+
"role": "Developer"
48+
}
49+
],
3150
"support": {
3251
"issues": "https://github.com/rmariuzzo/laravel-js-localization/issues",
3352
"source": "https://github.com/rmariuzzo/laravel-js-localization"
3453
},
3554
"require": {
36-
"php": ">=5.4.0",
37-
"illuminate/config": ">=4.2",
38-
"illuminate/console": ">=4.2",
39-
"illuminate/filesystem": ">=4.2",
40-
"tedivm/jshrink": "~1.0",
41-
"vlucas/phpdotenv": "^3.3"
55+
"php": "^5.4 || ^7.0",
56+
"illuminate/config": "^4.2 || ^5.0 || ^6.0 || ^7.0",
57+
"illuminate/console": "^4.2 || ^5.0 || ^6.0 || ^7.0",
58+
"illuminate/filesystem": "^4.2 || ^5.0 || ^6.0 || ^7.0",
59+
"tedivm/jshrink": "~1.0"
4260
},
4361
"require-dev": {
44-
"phpunit/phpunit": "4.8.*"
62+
"orchestra/testbench": "^2.2 || ^3.0 || ^4.0",
63+
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
4564
},
4665
"autoload": {
4766
"psr-4": {
@@ -54,29 +73,11 @@
5473
}
5574
},
5675
"minimum-stability": "stable",
57-
"scripts": {
58-
"test-install": [
59-
"composer install --prefer-dist --no-interaction --working-dir tests/4.2",
60-
"composer install --prefer-dist --no-interaction --working-dir tests/5.0",
61-
"composer install --prefer-dist --no-interaction --working-dir tests/5.1",
62-
"composer install --prefer-dist --no-interaction --working-dir tests/5.2",
63-
"./tests/5.3/install",
64-
"./tests/5.4/install"
65-
],
66-
"test": [
67-
"./vendor/bin/phpunit --configuration tests/4.2",
68-
"./vendor/bin/phpunit --configuration tests/5.0",
69-
"./vendor/bin/phpunit --configuration tests/5.1",
70-
"./vendor/bin/phpunit --configuration tests/5.2",
71-
"./tests/5.3/run",
72-
"./tests/5.4/run"
73-
]
74-
},
7576
"extra": {
7677
"laravel": {
7778
"providers": [
7879
"Mariuzzo\\LaravelJsLocalization\\LaravelJsLocalizationServiceProvider"
7980
]
8081
}
8182
}
82-
}
83+
}

‎tests/5.0/phpunit.xml‎ renamed to ‎phpunit.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
convertWarningsToExceptions="true"
1010
processIsolation="false"
1111
stopOnFailure="false"
12-
syntaxCheck="false">
12+
verbose="true">
1313
<testsuites>
1414
<testsuite name="Package">
15-
<directory suffix="Test.php">../specs/</directory>
15+
<directory suffix="Test.php">./tests/specs</directory>
1616
</testsuite>
1717
</testsuites>
1818
<filter>
1919
<whitelist>
20-
<directory suffix=".php">./src/</directory>
20+
<directory suffix=".php">./src</directory>
2121
</whitelist>
2222
</filter>
2323
</phpunit>

‎tests/4.2/composer.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)