Add in support for Laravel 7 (thedevdojo#4802)

* Add in support for Laravel 7

* Test against Laravel 7

* Update orchestra/testbench dependencies

* Update browser-kit-testing and PHPUnit

* Make version constraint more generic

* Make tests pass

* Drop Laravel 5 support for Voyager 1.4

* Delete .travis.yml

Co-authored-by: Christoph Schweppe <[email protected]>

.github/workflows/test.yml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4]
-        laravel: ['5.5.*', '5.8.*', '6.*']
+        php: [7.3, 7.4]
+        laravel: ['6.*', '7.*']
 
     name: 'PHP ${{ matrix.php }} / ${{ matrix.laravel }}'
 

README.md

@@ -24,7 +24,11 @@ View the Voyager Cheat Sheet: https://voyager-cheatsheet.ulties.com/
 
 <hr>
 
-Laravel Admin & BREAD System (Browse, Read, Edit, Add, & Delete), supporting Laravel 5.5 and newer!
+Laravel Admin & BREAD System (Browse, Read, Edit, Add, & Delete), supporting Laravel 6 and newer!
+
+```
+Want to use Laravel 5? Use [Voyager 1.3](https://github.com/the-control-group/voyager/tree/1.3)
+```
 
 ## Installation Steps
 

composer.json

@@ -15,22 +15,23 @@
         }
     ],
     "require": {
-        "illuminate/support": "~5.5|~6.0",
+        "illuminate/support": "~6.0|~7.0",
         "intervention/image": "^2.4",
         "doctrine/dbal": "^2.5",
         "larapack/doctrine-support": "~0.1.4",
+        "laravel/ui": ">=1.0",
         "arrilot/laravel-widgets": "^3.7",
         "league/flysystem": "~1.0.41",
         "larapack/voyager-hooks": "~1.2.1",
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpcov": "~4.0|~5.0|~6.0",
-        "phpunit/phpunit": "~5.7.14|~6.1|~7.0|~8.0",
-        "laravel/framework": "~5.5|~6.0",
-        "orchestra/testbench": "~3.0|~4.0",
-        "laravel/browser-kit-testing": "~2.0.0|~3.0.0|~4.0.0|~5.0.0|~5.1",
-        "orchestra/testbench-browser-kit": "~3.5|~3.6|~3.7|~3.8|~4.0.0"
+        "phpunit/phpcov": ">=6.0",
+        "phpunit/phpunit": ">=8.0",
+        "laravel/framework": "~6.0|~7.0",
+        "orchestra/testbench": ">=4.0",
+        "laravel/browser-kit-testing": ">=5.0.0",
+        "orchestra/testbench-browser-kit": ">=4.0"
     },
     "autoload": {
         "psr-4": {
@@ -40,7 +41,7 @@
     "autoload-dev": {
         "psr-4": {
             "TCG\\Voyager\\Tests\\": "tests/"
-      }
+        }
     },
     "minimum-stability": "stable",
     "extra": {

src/Commands/InstallCommand.php

@@ -94,7 +94,7 @@ public function handle(Filesystem $filesystem)
 
         $composer = $this->findComposer();
 
-        $process = new Process($composer.' dump-autoload');
+        $process = new Process([$composer.' dump-autoload']);
         $process->setTimeout(null); // Setting timeout to null to prevent installation from stopping at a certain point in time
         $process->setWorkingDirectory(base_path())->run();
 

tests/DisabledTestException.php

@@ -11,11 +11,11 @@ public function __construct()
     {
     }
 
-    public function report(Exception $e)
+    public function report($e)
     {
     }
 
-    public function render($request, Exception $e)
+    public function render($request, $e)
     {
         throw $e;
     }