Merge pull request #25 from mikebronner/patch-1

Add Laravel 6.0 compatibility.

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 /vendor
 phpunit.phar
-composer.lock
+composer.lock
+.phpunit.result.cache

.travis.yml

@@ -1,11 +1,11 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
+  - 7.2
+  - 7.3
 
 sudo: false
 

composer.json

@@ -11,13 +11,12 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "^4.0|^5.0",
-        "illuminate/contracts": "^5.0"
+        "illuminate/contracts": "5.0 - 6.0",
+        "illuminate/support": "4.0 - 6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0|^5.0",
-        "satooshi/php-coveralls": "^0.6"
+        "php-coveralls/php-coveralls": "*",
+        "phpunit/phpunit": "^4.0|^5.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="true"
-         syntaxCheck="false"
+    backupStaticAttributes="false"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="true"
 >
     <testsuites>
         <testsuite name="Test Suite">

tests/ModelTest.php

@@ -1,6 +1,8 @@
 <?php
 
-class ModelTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ModelTest extends TestCase
 {
     public function testAttributeManipulation()
     {
@@ -234,7 +236,7 @@ public function testGuardedCallback()
 
     public function testTotallyGuarded()
     {
-        $this->setExpectedException('Jenssegers\Model\MassAssignmentException');
+        $this->expectException('Jenssegers\Model\MassAssignmentException');
 
         $model = new ModelStub();
         $model->guard(['*']);