From 6e84c3af0d44a133daa154e4e09e6fa3ea3019d5 Mon Sep 17 00:00:00 2001 From: Kieran Brahney Date: Sun, 15 Mar 2020 12:45:20 +0000 Subject: [PATCH 1/5] Added PHP 7.4 & Laravel 7 to tests --- .travis.yml | 8 ++++++++ README.md | 1 + tests/composer-7.0.json | 26 ++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 tests/composer-7.0.json diff --git a/.travis.yml b/.travis.yml index be0b4b7c..61b6302f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ php: - 7.1 - 7.2 - 7.3 + - 7.4 env: matrix: @@ -17,6 +18,7 @@ env: - LARAVEL=5.7 - LARAVEL=5.8 - LARAVEL=6.0 + - LARAVEL=7.0 matrix: exclude: @@ -30,6 +32,8 @@ matrix: env: LARAVEL=5.8 - php: 5.6 env: LARAVEL=6.0 + - php: 5.6 + env: LARAVEL=7.0 - php: 7.0 env: LARAVEL=5.6 - php: 7.0 @@ -38,8 +42,12 @@ matrix: env: LARAVEL=5.8 - php: 7.0 env: LARAVEL=6.0 + - php: 7.0 + env: LARAVEL=7.0 - php: 7.1 env: LARAVEL=6.0 + - php: 7.1 + env: LARAVEL=7.0 before_script: - export COMPOSER=tests/composer-$LARAVEL.json diff --git a/README.md b/README.md index 359367b7..c46a72c0 100644 --- a/README.md +++ b/README.md @@ -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 | diff --git a/tests/composer-7.0.json b/tests/composer-7.0.json new file mode 100644 index 00000000..8b8423e3 --- /dev/null +++ b/tests/composer-7.0.json @@ -0,0 +1,26 @@ +{ + "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" + }, + "require-dev": { + "phpunit/phpunit": "^7.0", + "mockery/mockery": "^1.0" + }, + "autoload": { + "psr-4": { + "Proengsoft\\JsValidation\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "Proengsoft\\JsValidation\\Tests\\": "tests" + } + } +} From b820e466ba07acb3c63857d8f44454a184fe55e2 Mon Sep 17 00:00:00 2001 From: Kieran Brahney Date: Sun, 15 Mar 2020 13:08:12 +0000 Subject: [PATCH 2/5] removed php 7.4 from unsupported laravel versions --- .travis.yml | 8 ++++++++ phpunit.xml.dist | 1 + 2 files changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 61b6302f..ff9cf42b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,14 @@ matrix: env: LARAVEL=6.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.4 + env: LARAVEL=5.7 before_script: - export COMPOSER=tests/composer-$LARAVEL.json diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c5e9360f..eb3f9e5c 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -2,6 +2,7 @@ Date: Sun, 15 Mar 2020 13:43:27 +0000 Subject: [PATCH 3/5] Added requirement for symfony/http-foundation 4.1+ --- composer.json | 3 ++- src/Javascript/MessageParser.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3564f11e..98dbc0f8 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,8 @@ "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" + "illuminate/view": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^4.1|^5.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.10", diff --git a/src/Javascript/MessageParser.php b/src/Javascript/MessageParser.php index dd43ab56..114d79c8 100644 --- a/src/Javascript/MessageParser.php +++ b/src/Javascript/MessageParser.php @@ -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); } } From 8d4dd950adc9cb34cf428e95f89cb84f9a58dd84 Mon Sep 17 00:00:00 2001 From: Kieran Brahney Date: Sun, 15 Mar 2020 13:47:46 +0000 Subject: [PATCH 4/5] Dropped support for Laravel 5.4 and 5.5 (due to symfony/http-foundation dep) --- .travis.yml | 26 -------------------------- composer.json | 16 ++++++++-------- tests/composer-5.4.json | 26 -------------------------- tests/composer-5.5.json | 26 -------------------------- 4 files changed, 8 insertions(+), 86 deletions(-) delete mode 100644 tests/composer-5.4.json delete mode 100644 tests/composer-5.5.json diff --git a/.travis.yml b/.travis.yml index ff9cf42b..2e4e56d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,6 @@ language: php sudo: false php: - - 5.6 - - 7.0 - 7.1 - 7.2 - 7.3 @@ -12,8 +10,6 @@ php: env: matrix: - - LARAVEL=5.4 - - LARAVEL=5.5 - LARAVEL=5.6 - LARAVEL=5.7 - LARAVEL=5.8 @@ -22,28 +18,6 @@ env: 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 - env: LARAVEL=6.0 - - php: 5.6 - env: LARAVEL=7.0 - - php: 7.0 - env: LARAVEL=5.6 - - php: 7.0 - env: LARAVEL=5.7 - - php: 7.0 - env: LARAVEL=5.8 - - php: 7.0 - env: LARAVEL=6.0 - - php: 7.0 - env: LARAVEL=7.0 - php: 7.1 env: LARAVEL=6.0 - php: 7.1 diff --git a/composer.json b/composer.json index 98dbc0f8..4a9da6cb 100644 --- a/composer.json +++ b/composer.json @@ -26,14 +26,14 @@ } ], "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": { diff --git a/tests/composer-5.4.json b/tests/composer-5.4.json deleted file mode 100644 index 10c4649e..00000000 --- a/tests/composer-5.4.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "require": { - "php": ">=5.6.4", - "illuminate/support": "5.4.*", - "illuminate/validation": "5.4.*", - "illuminate/contracts": "5.4.*", - "illuminate/view": "5.4.*", - "illuminate/config": "5.4.*", - "illuminate/http": "5.4.*", - "illuminate/translation": "5.4.*" - }, - "require-dev": { - "phpunit/phpunit": "^5.7", - "mockery/mockery": "^0.9.8" - }, - "autoload": { - "psr-4": { - "Proengsoft\\JsValidation\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "Proengsoft\\JsValidation\\Tests\\": "tests" - } - } -} diff --git a/tests/composer-5.5.json b/tests/composer-5.5.json deleted file mode 100644 index fe8024ec..00000000 --- a/tests/composer-5.5.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "require": { - "php": ">=7.0.8", - "illuminate/support": "5.5.*", - "illuminate/validation": "5.5.*", - "illuminate/contracts": "5.5.*", - "illuminate/view": "5.5.*", - "illuminate/config": "5.5.*", - "illuminate/http": "5.5.*", - "illuminate/translation": "5.5.*" - }, - "require-dev": { - "phpunit/phpunit": "~6.0", - "mockery/mockery": "^0.9.8" - }, - "autoload": { - "psr-4": { - "Proengsoft\\JsValidation\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "Proengsoft\\JsValidation\\Tests\\": "tests" - } - } -} From d0104228f5155491f56a52c049769c7f15ab5b88 Mon Sep 17 00:00:00 2001 From: Kieran Brahney Date: Sun, 15 Mar 2020 13:48:40 +0000 Subject: [PATCH 5/5] Added symfony/http-foundation to test matrix --- tests/composer-5.6.json | 3 ++- tests/composer-5.7.json | 3 ++- tests/composer-5.8.json | 3 ++- tests/composer-6.0.json | 3 ++- tests/composer-7.0.json | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/composer-5.6.json b/tests/composer-5.6.json index 2875cacf..837fec67 100644 --- a/tests/composer-5.6.json +++ b/tests/composer-5.6.json @@ -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", diff --git a/tests/composer-5.7.json b/tests/composer-5.7.json index f62642b0..612be74c 100644 --- a/tests/composer-5.7.json +++ b/tests/composer-5.7.json @@ -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", diff --git a/tests/composer-5.8.json b/tests/composer-5.8.json index 1f4f66c9..7e6c59bf 100644 --- a/tests/composer-5.8.json +++ b/tests/composer-5.8.json @@ -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", diff --git a/tests/composer-6.0.json b/tests/composer-6.0.json index af120daa..a702c08b 100644 --- a/tests/composer-6.0.json +++ b/tests/composer-6.0.json @@ -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", diff --git a/tests/composer-7.0.json b/tests/composer-7.0.json index 8b8423e3..efc64033 100644 --- a/tests/composer-7.0.json +++ b/tests/composer-7.0.json @@ -7,7 +7,8 @@ "illuminate/view": "^7.0", "illuminate/config": "^7.0", "illuminate/http": "^7.0", - "illuminate/translation": "^7.0" + "illuminate/translation": "^7.0", + "symfony/http-foundation": "^4.1|^5.0" }, "require-dev": { "phpunit/phpunit": "^7.0",