Merge pull request #1 from Jaspaul/master

Merge main repo back into fork

Author: JaskirtPooni

.travis.yml

@@ -1,8 +1,9 @@
 language: php
 
 php:
-    - 7.0
-    - 7.1
+    - 7.2
+    - 7.3
+    - 7.4
 
 before_script: composer install
 

composer.json

@@ -10,13 +10,13 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/support": "^5.4",
-        "illuminate/database": "^5.4",
-        "illuminate/validation": "^5.4"
+        "php": ">=7.2",
+        "illuminate/support": "^6.0",
+        "illuminate/database": "^6.0",
+        "illuminate/validation": "^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^6.0 || ^7.0 ||^8.0",
         "mockery/mockery": "^0.9.9",
         "squizlabs/php_codesniffer": "^2.8",
         "satooshi/php-coveralls": "^1.0"

readme.md

@@ -19,8 +19,9 @@ $ composer require jaspaul/eloquent-model-validation
 
 The following versions of PHP are supported by this version.
 
-* PHP 7.0
-* PHP 7.1
+* PHP 7.2
+* PHP 7.3
+* PHP 7.4
 
 ## Configuration
 

tests/InvalidModelTest.php

@@ -7,6 +7,7 @@
 use PDOStatement;
 use Tests\Doubles\InvalidModel;
 use Illuminate\Database\SQLiteConnection;
+use Illuminate\Validation\ValidationException;
 use Illuminate\Database\ConnectionResolverInterface;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
 use Jaspaul\EloquentModelValidation\Contracts\Validatable;
@@ -35,20 +36,18 @@ public function testGetErrorsReturnsAMessageBagWithTheEmailKey()
         $this->assertTrue($errors->has('email'));
     }
 
-    /**
-     * @expectedException \Illuminate\Validation\ValidationException
-     */
     public function testSaveThrowsAValidationException()
     {
+        $this->expectException(ValidationException::class);
+
         $model = new InvalidModel();
         $model->save();
     }
 
-    /**
-     * @expectedException \Illuminate\Validation\ValidationException
-     */
     public function testValidateThrowsAValidationException()
     {
+        $this->expectException(ValidationException::class);
+
         $model = new InvalidModel();
         $model->validate();
     }