Merge pull request #25 from Naoray/feature/add-laravel-6-support

Feature/add laravel 6 support
romegasoftware · Sep 5, 2019 · 8f093a1 · 8f093a1
2 parents d706eff + c0425ea
commit 8f093a1
Show file tree

Hide file tree

Showing 6 changed files with 891 additions and 502 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 /vendor
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         }
     },
     "require": {
-        "spatie/laravel-permission": "^2.29"
+        "spatie/laravel-permission": "^3.0"
     },
     "extra": {
         "laravel": {
@@ -28,8 +28,8 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5",
-        "orchestra/testbench": "^3.7",
-        "codedungeon/phpunit-result-printer": "^0.6.0"
+        "phpunit/phpunit": "^8.0",
+        "orchestra/testbench": "^4.0",
+        "codedungeon/phpunit-result-printer": "^0.26.0"
     }
 }