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
32 changes: 11 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,33 @@ language: php
sudo: false

php:
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4

env:
matrix:
- LARAVEL=5.4
- LARAVEL=5.5
- LARAVEL=5.6
- LARAVEL=5.7
- LARAVEL=5.8
- LARAVEL=6.0
- LARAVEL=7.0

matrix:
exclude:
- php: 5.6
env: LARAVEL=5.5
- php: 5.6
env: LARAVEL=5.6
- php: 5.6
env: LARAVEL=5.7
- php: 5.6
env: LARAVEL=5.8
- php: 5.6
- php: 7.1
env: LARAVEL=6.0
- php: 7.0
- php: 7.1
env: LARAVEL=7.0
- php: 7.4
env: LARAVEL=5.4
- php: 7.4
env: LARAVEL=5.5
- php: 7.4
env: LARAVEL=5.6
- php: 7.0
- php: 7.4
env: LARAVEL=5.7
- php: 7.0
env: LARAVEL=5.8
- php: 7.0
env: LARAVEL=6.0
- php: 7.1
env: LARAVEL=6.0

before_script:
- export COMPOSER=tests/composer-$LARAVEL.json
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ You can validate forms automatically referencing it to your defined validations.

| Laravel Version | Package Version | Support Status |
| --------------- | --------------- | --------------- |
| `7.x` | `2.x (>2.6.0)` | Maintained |
| `6.x` | `2.x (>2.5.0)` | Maintained |
| `5.8` | `2.x (>2.4.0)` | EOL |
| `5.7` | `2.x (>2.3.1)` | EOL |
Expand Down
17 changes: 9 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
}
],
"require": {
"php": ">=5.6.4",
"illuminate/config": "^5.4|^6.0|^7.0",
"illuminate/contracts": "^5.4|^6.0|^7.0",
"illuminate/http": "^5.4|^6.0|^7.0",
"illuminate/support": "^5.4|^6.0|^7.0",
"illuminate/translation": "^5.4|^6.0|^7.0",
"illuminate/validation": "^5.4|^6.0|^7.0",
"illuminate/view": "^5.4|^6.0|^7.0"
"php": ">=7.1.3",
"illuminate/config": "^5.6|^6.0|^7.0",
"illuminate/contracts": "^5.6|^6.0|^7.0",
"illuminate/http": "^5.6|^6.0|^7.0",
"illuminate/support": "^5.6|^6.0|^7.0",
"illuminate/translation": "^5.6|^6.0|^7.0",
"illuminate/validation": "^5.6|^6.0|^7.0",
"illuminate/view": "^5.6|^6.0|^7.0",
"symfony/http-foundation": "^4.1|^5.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.10",
Expand Down
1 change: 1 addition & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<phpunit bootstrap="tests/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
beStrictAboutTestsThatDoNotTestAnything="false"
colors="true"
verbose="true"
convertErrorsToExceptions="true"
Expand Down
2 changes: 1 addition & 1 deletion src/Javascript/MessageParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@ private function fakeFileData($data, $attribute)
*/
protected function createUploadedFile()
{
return new UploadedFile('fakefile', 'fakefile', null, null, UPLOAD_ERR_NO_FILE, true);
return new UploadedFile('fakefile', 'fakefile', null, UPLOAD_ERR_NO_FILE, true);
}
}
26 changes: 0 additions & 26 deletions tests/composer-5.4.json

This file was deleted.

26 changes: 0 additions & 26 deletions tests/composer-5.5.json

This file was deleted.

3 changes: 2 additions & 1 deletion tests/composer-5.6.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"illuminate/view": "5.6.*",
"illuminate/config": "5.6.*",
"illuminate/http": "5.6.*",
"illuminate/translation": "5.6.*"
"illuminate/translation": "5.6.*",
"symfony/http-foundation": "^4.1|^5.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
Expand Down
3 changes: 2 additions & 1 deletion tests/composer-5.7.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"illuminate/view": "5.7.*",
"illuminate/config": "5.7.*",
"illuminate/http": "5.7.*",
"illuminate/translation": "5.7.*"
"illuminate/translation": "5.7.*",
"symfony/http-foundation": "^4.1|^5.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
Expand Down
3 changes: 2 additions & 1 deletion tests/composer-5.8.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"illuminate/view": "5.8.*",
"illuminate/config": "5.8.*",
"illuminate/http": "5.8.*",
"illuminate/translation": "5.8.*"
"illuminate/translation": "5.8.*",
"symfony/http-foundation": "^4.1|^5.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
Expand Down
3 changes: 2 additions & 1 deletion tests/composer-6.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"illuminate/view": "^6.0",
"illuminate/config": "^6.0",
"illuminate/http": "^6.0",
"illuminate/translation": "^6.0"
"illuminate/translation": "^6.0",
"symfony/http-foundation": "^4.1|^5.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
Expand Down
27 changes: 27 additions & 0 deletions tests/composer-7.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"require": {
"php": ">=7.2.5",
"illuminate/support": "^7.0",
"illuminate/validation": "^7.0",
"illuminate/contracts": "^7.0",
"illuminate/view": "^7.0",
"illuminate/config": "^7.0",
"illuminate/http": "^7.0",
"illuminate/translation": "^7.0",
"symfony/http-foundation": "^4.1|^5.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"mockery/mockery": "^1.0"
},
"autoload": {
"psr-4": {
"Proengsoft\\JsValidation\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Proengsoft\\JsValidation\\Tests\\": "tests"
}
}
}