Merge pull request #7 from GeneaLabs/feature/update-to-laravel-6

Add Laravel 6.0 compatibility.
mikebronner · Aug 29, 2019 · c7067e5 · c7067e5
2 parents 5be7b91 + 1fde658
commit c7067e5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /vendor
 composer.lock
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-    - 7.1
     - 7.2
     - 7.3
 

diff --git a/composer.json b/composer.json
@@ -9,16 +9,16 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3",
-        "illuminate/auth": "5.5 - 5.8"
+        "illuminate/auth": "5.5 - 6.0",
+        "php": ">=7.2"
     },
     "require-dev": {
-        "fzaninotto/faker": "~1.4",
-        "laravel/laravel": "5.8.*",
+        "fzaninotto/faker": "*",
+        "laravel/laravel": "dev-develop@dev",
         "mockery/mockery": "*",
-        "phpmd/phpmd": "^2.6",
-        "phpunit/phpunit": "7.*",
-        "satooshi/php-coveralls" : "*",
+        "phpmd/phpmd": "*",
+        "phpunit/phpunit": "*",
+        "php-coveralls/php-coveralls" : "*",
         "sebastian/phpcpd": "*"
     },
     "autoload": {
@@ -37,5 +37,7 @@
                 "GeneaLabs\\LaravelAuthorizationAddons\\Providers\\Service"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -7,7 +7,6 @@
     convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
     bootstrap="vendor/autoload.php"
 >
 <testsuites>