Add support for Laravel 7

Author: ivanvermeyen

.travis.yml

@@ -17,6 +17,8 @@ matrix:
           env: ILLUMINATE_VERSION=5.7.* TESTBENCH_VERSION=3.7.*
         - php: 7.2
           env: ILLUMINATE_VERSION=5.6.* TESTBENCH_VERSION=3.6.*
+        - php: 7.3
+          env: ILLUMINATE_VERSION=7.* TESTBENCH_VERSION=5.*
         - php: 7.3
           env: ILLUMINATE_VERSION=6.* TESTBENCH_VERSION=4.*
         - php: 7.3
@@ -25,6 +27,8 @@ matrix:
           env: ILLUMINATE_VERSION=5.7.* TESTBENCH_VERSION=3.7.*
         - php: 7.3
           env: ILLUMINATE_VERSION=5.6.* TESTBENCH_VERSION=3.6.*
+        - php: 7.4
+          env: ILLUMINATE_VERSION=7.* TESTBENCH_VERSION=5.*
         - php: 7.4
           env: ILLUMINATE_VERSION=6.* TESTBENCH_VERSION=4.*
         - php: 7.4

composer.json

@@ -23,12 +23,12 @@
         "php": "^7.1",
         "0.0.0/composer-include-files": "^1.5",
         "codezero/laravel-localizer": "^1.1",
-        "illuminate/support": "^5.6|^6.0"
+        "illuminate/support": "^5.6|^6.0|^7.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3",
-        "orchestra/testbench": "^3.6|^4.0",
-        "phpunit/phpunit": "^7.0|^8.0"
+        "orchestra/testbench": "^3.6|^4.0|^5.0",
+        "phpunit/phpunit": "^7.0|^8.0|^9.0"
     },
     "scripts": {
         "test": "phpunit"

tests/Stubs/Model.php

@@ -35,10 +35,11 @@ public function getSlug($locale = null)
      * Fake route model binding.
      *
      * @param string $parameter
+     * @param string|null $field
      *
      * @return mixed
      */
-    public function resolveRouteBinding($parameter)
+    public function resolveRouteBinding($parameter, $field = null)
     {
         // Bypass the database for testing purpose and return
         // the current model as if it was found in the database.

tests/Stubs/ModelWithCustomRouteParameters.php

@@ -29,10 +29,11 @@ public function getRouteParameters($locale = null)
      * Fake route model binding (avoid database for test purpose).
      *
      * @param int $id
+     * @param string|null $field
      *
      * @return mixed
      */
-    public function resolveRouteBinding($id)
+    public function resolveRouteBinding($id, $field = null)
     {
         return $this;
     }

tests/TestCase.php

@@ -5,13 +5,13 @@
 use CodeZero\LocalizedRoutes\LocalizedRoutesServiceProvider;
 use CodeZero\Localizer\LocalizerServiceProvider;
 use Illuminate\Contracts\View\View;
-use Illuminate\Foundation\Testing\Assert as PHPUnit;
-use Illuminate\Foundation\Testing\TestResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Testing\Assert as PHPUnit;
+use Illuminate\Testing\TestResponse;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 abstract class TestCase extends  BaseTestCase
@@ -27,7 +27,7 @@ protected function setUp(): void
 
         TestResponse::macro('assertResponseHasNoView', function () {
             if (isset($this->original) && $this->original instanceof View) {
-                return PHPUnit::fail('The response has a view.');
+                PHPUnit::fail('The response has a view.');
             }
 
             return $this;