Add support for Laravel 10 (#72)

Author: laravel-shift

.github/workflows/run-tests.yml

@@ -9,8 +9,11 @@ jobs:
       fail-fast: true
       matrix:
         php: [ 8.0, 8.1 ]
-        laravel: [ 8.*, 9.* ]
+        laravel: [ 8.*, 9.* , 10.*]
         dependency-version: [ prefer-stable ]
+        exclude:
+          - laravel: 10.*
+            php: 8.0
         include:
           - laravel: 5.6.*
             php: 7.1
@@ -40,6 +43,8 @@ jobs:
             testbench: 6.*
           - laravel: 9.*
             testbench: 7.*
+          - laravel: 10.*
+            testbench: 8.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

composer.json

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

src/LocalizedUrlGenerator.php

@@ -431,7 +431,7 @@ protected function getLocalizedRouteKey($key, UrlRoutable $model, $locale)
      */
     protected function getBindingFieldFor($key, UrlRoutable $model)
     {
-        if (App::version() < 7) {
+        if (version_compare(App::version(), '7.0.0') === -1) {
             return $model->getRouteKeyName();
         }
 

tests/TestCase.php

@@ -23,7 +23,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->app->version() < 7) {
+        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.');

tests/Unit/HelpersFileTest.php

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

tests/Unit/Macros/LocalizedUrlMacroTest.php

@@ -96,7 +96,7 @@ public function it_generates_urls_for_the_current_route_with_diferent_models_usi
     /** @test */
     public function it_generates_urls_with_custom_localized_route_keys_for_the_current_route_using_route_model_binding()
     {
-        if (App::version() < 7) {
+        if (version_compare($this->app->version(), '7.0.0') === -1) {
             $this->markTestSkipped('This feature is only available in Laravel 7 and newer.');
         }
 

tests/Unit/RouteModelBindingTest.php

@@ -45,7 +45,7 @@ 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 (App::version() < 7) {
+        if (version_compare($this->app->version(), '7.0.0') === -1) {
             $this->markTestSkipped('This feature is only available in Laravel 7 and newer.');
         }
 

tests/Unit/UrlGeneratorTest.php

@@ -188,7 +188,7 @@ 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 (App::version() < 7) {
+        if (version_compare($this->app->version(), '7.0.0') === -1) {
             $this->markTestSkipped('This feature is only available in Laravel 7 and newer.');
         }