Remove code specific to Laravel < 7.0 (#86)

Author: ivanvermeyen

src/LocalizedUrlGenerator.php

@@ -330,10 +330,6 @@ protected function getLocalizedRouteKey($key, UrlRoutable $model, $locale)
      */
     protected function getBindingFieldFor($key, UrlRoutable $model)
     {
-        if (version_compare(App::version(), '7.0.0') === -1) {
-            return $model->getRouteKeyName();
-        }
-
         return $this->route->bindingFieldFor($key) ?: $model->getRouteKeyName();
     }
 }

tests/TestCase.php

@@ -13,7 +13,9 @@
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Str;
+use Illuminate\Testing\TestResponse;
 use Orchestra\Testbench\TestCase as BaseTestCase;
+use PHPUnit\Framework\Assert;
 
 abstract class TestCase extends  BaseTestCase
 {
@@ -37,24 +39,27 @@ protected function setUp(): void
         $this->sessionKey = Config::get('localized-routes.session_key');
         $this->cookieName = Config::get('localized-routes.cookie_name');
 
-        if (version_compare($this->app->version(), '7.0.0') === -1) {
-            \Illuminate\Foundation\Testing\TestResponse::macro('assertResponseHasNoView', function () {
-                if (isset($this->original) && $this->original instanceof View) {
-                    Illuminate\Foundation\Testing\Assert::fail('The response has a view.');
-                }
-
-                return $this;
-            });
-        } else {
-            \Illuminate\Testing\TestResponse::macro('assertResponseHasNoView', function () {
-                if (isset($this->original) && $this->original instanceof View) {
-                    Illuminate\Testing\Assert::fail('The response has a view.');
-                }
-
-                return $this;
-            });
-        }
+        TestResponse::macro('assertResponseHasNoView', function () {
+            if (isset($this->original) && $this->original instanceof View) {
+                Assert::fail('The response has a view.');
+            }
+
+            return $this;
+        });
+    }
 
+    /**
+     * Skip test if laravel version is lower than the given version.
+     *
+     * @param string $version
+     *
+     * @return void
+     */
+    protected function skipTestIfLaravelVersionIsLowerThan($version)
+    {
+        if (version_compare(App::version(), $version) === -1) {
+            $this->markTestSkipped("This test only applies to Laravel {$version} and higher.");
+        }
     }
 
     /**

tests/Unit/HelpersFileTest.php

@@ -33,11 +33,7 @@ function it_throws_when_route_helper_locale_is_unsupported(): void
             Route::get('route')->name('route');
         });
 
-        if (version_compare($this->app->version(), '6.0.0') === -1) {
-            $this->expectExceptionMessage('Route [wk.route] not defined.');
-        } else {
-            $this->expectException(RouteNotFoundException::class);
-        }
+        $this->expectException(RouteNotFoundException::class);
 
         route('route', [], true, 'wk');
     }

tests/Unit/Macros/Route/LocalizedUrlMacroTest.php

@@ -96,10 +96,6 @@ public function it_generates_urls_for_the_current_route_with_different_models_us
     /** @test */
     public function it_generates_urls_with_custom_localized_route_keys_for_the_current_route_using_route_model_binding()
     {
-        if (version_compare($this->app->version(), '7.0.0') === -1) {
-            $this->markTestSkipped('This feature is only available in Laravel 7 and newer.');
-        }
-
         $this->withoutExceptionHandling();
         $this->setSupportedLocales(['en', 'nl']);
 

tests/Unit/Middleware/SetLocaleTest.php

@@ -135,9 +135,7 @@ public function it_looks_for_a_locale_on_the_authenticated_user()
     /** @test */
     public function it_will_bypass_missing_attribute_exception_if_the_locale_attribute_is_missing_on_the_user_model()
     {
-        if (version_compare(App::version(), '9.35.0') === -1) {
-            $this->markTestSkipped('This test only applies to Laravel 9.35.0 and higher.');
-        }
+        $this->skipTestIfLaravelVersionIsLowerThan('9.35.0');
 
         $this->setSupportedLocales(['en', 'nl']);
         $this->setAppLocale('en');

tests/Unit/RouteModelBindingTest.php

@@ -47,10 +47,6 @@ public function it_loads_a_route_with_a_localized_route_key_based_on_the_active_
     /** @test */
     public function it_loads_a_route_with_a_custom_localized_route_key_based_on_the_active_locale()
     {
-        if (version_compare($this->app->version(), '7.0.0') === -1) {
-            $this->markTestSkipped('This feature is only available in Laravel 7 and newer.');
-        }
-
         $this->setSupportedLocales(['en', 'nl']);
 
         $model = (new Model([

tests/Unit/UrlGeneratorTest.php

@@ -204,10 +204,6 @@ public function it_generates_a_url_for_a_route_with_a_default_localized_route_ke
     /** @test */
     public function it_generates_a_url_for_a_route_with_a_custom_localized_route_key()
     {
-        if (version_compare($this->app->version(), '7.0.0') === -1) {
-            $this->markTestSkipped('This feature is only available in Laravel 7 and newer.');
-        }
-
         $this->setSupportedLocales(['en', 'nl']);
         $this->setAppLocale('en');
 
@@ -299,17 +295,9 @@ protected function cacheRoutes()
             $route->prepareForSerialization();
         }
 
-        $isLaravel7orGreater = method_exists($routes, 'compile');
-
-        if ($isLaravel7orGreater) {
-            $this->app['router']->setCompiledRoutes(
-                $routes->compile()
-            );
-
-            return;
-        }
-
-        $this->app['router']->setRoutes($routes);
+        $this->app['router']->setCompiledRoutes(
+            $routes->compile()
+        );
     }
 
     /**