From bae17a2c7e7be7c43cd70c885bb12b6efc9769c0 Mon Sep 17 00:00:00 2001 From: Kostas Bastas Date: Mon, 3 Jul 2017 18:40:51 +0300 Subject: [PATCH 1/7] Update jsvalidation.js added fix for #239. Image rule to validate jpeg files. --- public/js/jsvalidation.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/js/jsvalidation.js b/public/js/jsvalidation.js index 83f0b5a0..549ecc3d 100644 --- a/public/js/jsvalidation.js +++ b/public/js/jsvalidation.js @@ -3988,7 +3988,8 @@ $.extend(true, laravelValidation, { * Validate the MIME type of a file upload attribute is in a set of MIME types. */ Image: function(value, element) { - return laravelValidation.methods.Mimes.call(this, value, element, ['jpg', 'png', 'gif', 'bmp', 'svg']); + //fixing request for validation of jpeg files + return laravelValidation.methods.Mimes.call(this, value, element, ['jpg', 'png', 'gif', 'bmp', 'svg','jpeg']); }, /** From 53e084d1a06329d57ac399298b818fcb749c50ef Mon Sep 17 00:00:00 2001 From: Kostas Bastas Date: Mon, 3 Jul 2017 19:17:43 +0300 Subject: [PATCH 2/7] Update .travis.yml change composer install according to travis documentation --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d7d7735c..58bafa52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: before_script: - export COMPOSER=tests/composer-$LARAVEL.json - - travis_retry composer install --no-interaction --prefer-source + - composer install script: - vendor/bin/phpunit --coverage-clover=coverage.clover From 6e3347dbadb6d7e213b2a109bed6d187bf56213a Mon Sep 17 00:00:00 2001 From: Kostas Bastas Date: Mon, 3 Jul 2017 19:22:36 +0300 Subject: [PATCH 3/7] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 58bafa52..932fcb7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ matrix: before_script: - export COMPOSER=tests/composer-$LARAVEL.json - composer install + - composer dump-autoload script: - vendor/bin/phpunit --coverage-clover=coverage.clover From 65ef5bb8165668996b1d104fa5d7a735bd116457 Mon Sep 17 00:00:00 2001 From: Kostas Bastas Date: Mon, 3 Jul 2017 19:40:33 +0300 Subject: [PATCH 4/7] Update Validator.php --- src/Remote/Validator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Remote/Validator.php b/src/Remote/Validator.php index 6be1901f..9fdef32a 100644 --- a/src/Remote/Validator.php +++ b/src/Remote/Validator.php @@ -154,7 +154,7 @@ protected function purgeNonRemoteRules($rules, $validator) $protectedValidator = $this->createProtectedCaller($validator); foreach ($rules as $i => $rule) { - $parsedRule = ValidationRuleParser::parse([$rule]); + $parsedRule = \ValidationRuleParser::parse([$rule]); if (! $this->isRemoteRule($parsedRule[0])) { unset($rules[$i]); } From 10814071983d093b57c996d70e38998e7872943f Mon Sep 17 00:00:00 2001 From: Kostas Bastas Date: Mon, 3 Jul 2017 19:47:46 +0300 Subject: [PATCH 5/7] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 932fcb7d..ce4618ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ matrix: before_script: - export COMPOSER=tests/composer-$LARAVEL.json + - composer require illuminate/validation - composer install - composer dump-autoload From fb3cd33e2476b8c4693f18a1700e300c6e7f8e44 Mon Sep 17 00:00:00 2001 From: Kostas Bastas Date: Mon, 3 Jul 2017 19:50:11 +0300 Subject: [PATCH 6/7] Update Validator.php --- src/Remote/Validator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Remote/Validator.php b/src/Remote/Validator.php index 9fdef32a..2d4d68ac 100644 --- a/src/Remote/Validator.php +++ b/src/Remote/Validator.php @@ -3,7 +3,7 @@ namespace Proengsoft\JsValidation\Remote; use Illuminate\Http\JsonResponse; -use Illuminate\Validation\ValidationRuleParser; +//use Illuminate\Validation\ValidationRuleParser; use Proengsoft\JsValidation\Support\RuleListTrait; use Illuminate\Http\Exceptions\HttpResponseException; use Illuminate\Validation\Validator as BaseValidator; From bcae2c050984ff71e90d19c1ff920be39c6ad2bd Mon Sep 17 00:00:00 2001 From: Kostas Bastas Date: Mon, 3 Jul 2017 19:50:42 +0300 Subject: [PATCH 7/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ce4618ed..86f43ca5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: before_script: - export COMPOSER=tests/composer-$LARAVEL.json - - composer require illuminate/validation + - composer install illuminate/validation - composer install - composer dump-autoload