Merge pull request #29 from TheDragonCode/andrey-helldar-patch-1

andrey-helldar · web-flow · commit d488062abcbb · 2025-02-24T20:35:38.000+03:00
Added Laravel 12 support
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -9,8 +9,8 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
-                laravel: [ "7.0", "8.0", "9.0", "10.0", "11.0" ]
+                php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
+                laravel: [ "7.0", "8.0", "9.0", "10.0", "11.0", "12.0" ]
                 exclude:
                     -   laravel: "7.0"
                         php: "8.1"
@@ -21,12 +21,18 @@ jobs:
                     -   laravel: "7.0"
                         php: "8.3"
 
+                    -   laravel: "7.0"
+                        php: "8.4"
+
                     -   laravel: "9.0"
                         php: "7.4"
 
                     -   laravel: "9.0"
                         php: "8.3"
 
+                    -   laravel: "9.0"
+                        php: "8.4"
+
                     -   laravel: "10.0"
                         php: "7.4"
 
@@ -42,6 +48,15 @@ jobs:
                     -   laravel: "11.0"
                         php: "8.1"
 
+                    -   laravel: "12.0"
+                        php: "7.4"
+
+                    -   laravel: "12.0"
+                        php: "8.0"
+
+                    -   laravel: "12.0"
+                        php: "8.1"
+
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
         steps:
diff --git a/composer.json b/composer.json
@@ -34,12 +34,11 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "fig/http-message-util": "^1.1",
-        "illuminate/routing": "^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0"
+        "illuminate/routing": "^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0"
     },
     "require-dev": {
-        "dragon-code/extended-routes": "^3.2 || ^4.0",
-        "orchestra/testbench": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "phpunit/phpunit": "^9.6 || ^10.0"
+        "orchestra/testbench": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
+        "phpunit/phpunit": "^9.6 || ^10.0 || ^11.0 || ^12.0"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,
@@ -71,4 +70,4 @@
             ]
         }
     }
-}
+}
diff --git a/phpunit.xml b/phpunit.xml
@@ -17,11 +17,6 @@
         <include>
             <directory suffix=".php">./src</directory>
         </include>
-        <report>
-            <clover outputFile="build/logs/clover.xml" />
-            <html outputDirectory="build/logs/coverage" />
-            <text outputFile="build/logs/coverage.txt" />
-        </report>
     </coverage>
     <testsuites>
         <testsuite name="Test Suite">
diff --git a/src/Application.php b/src/Application.php
diff --git a/tests/Concerns/Routes.php b/tests/Concerns/Routes.php
@@ -7,7 +7,6 @@
 use Illuminate\Routing\Router;
 use Tests\Http\Controllers\ApiResourceController;
 use Tests\Http\Controllers\Controller;
-use Tests\Http\Controllers\RestorableResourceController;
 use Tests\Http\Controllers\WebResourceController;
 
 trait Routes
@@ -109,8 +108,6 @@ protected function resourceRoutes(Router $router): void
         $router->resource('resources/photos', WebResourceController::class);
 
         $router->apiResource('resources/comments', ApiResourceController::class);
-
-        $router->apiRestorableResource('resources/pages', RestorableResourceController::class);
     }
 
     protected function protectedRoutes(Router $router): void
diff --git a/tests/Http/Controllers/RestorableResourceController.php b/tests/Http/Controllers/RestorableResourceController.php
diff --git a/tests/Routes/ResourcesTest.php b/tests/Routes/ResourcesTest.php
@@ -5,7 +5,6 @@
 namespace Tests\Routes;
 
 use Tests\Http\Controllers\ApiResourceController;
-use Tests\Http\Controllers\RestorableResourceController;
 use Tests\Http\Controllers\WebResourceController;
 use Tests\TestCase;
 
@@ -30,15 +29,4 @@ public function testApi(): void
         $this->assertSame('api.resources.comments.update', $this->getRouteName('update', ApiResourceController::class));
         $this->assertSame('api.resources.comments.destroy', $this->getRouteName('destroy', ApiResourceController::class));
     }
-
-    public function testRestorableApi(): void
-    {
-        $this->assertSame('api.resources.pages.index', $this->getRouteName('index', RestorableResourceController::class));
-        $this->assertSame('api.resources.pages.store', $this->getRouteName('store', RestorableResourceController::class));
-        $this->assertSame('api.resources.pages.trashed', $this->getRouteName('trashed', RestorableResourceController::class));
-        $this->assertSame('api.resources.pages.show', $this->getRouteName('show', RestorableResourceController::class));
-        $this->assertSame('api.resources.pages.update', $this->getRouteName('update', RestorableResourceController::class));
-        $this->assertSame('api.resources.pages.destroy', $this->getRouteName('destroy', RestorableResourceController::class));
-        $this->assertSame('api.resources.pages.restore', $this->getRouteName('restore', RestorableResourceController::class));
-    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the "dragon-code/support" project.
  *
@@ -16,13 +17,11 @@
 
 namespace Tests;
 
-use DragonCode\ExtendedRoutes\ServiceProvider as ExtendedRoutesServiceProvider;
-use DragonCode\LaravelRouteNames\Application;
+use DragonCode\LaravelRouteNames\Providers\RoutingServiceProvider;
 use DragonCode\LaravelRouteNames\ServiceProvider;
-use Illuminate\Foundation\Bootstrap\LoadConfiguration;
+use Illuminate\Events\EventServiceProvider;
+use Illuminate\Log\LogServiceProvider;
 use Illuminate\Support\Facades\Route as RouteFacade;
-use Orchestra\Testbench\Bootstrap\LoadConfiguration as OrchestraLoadConfiguration;
-use Orchestra\Testbench\Foundation\PackageManifest;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use Tests\Concerns\Routes;
 use Tests\Http\Controllers\Controller;
@@ -34,20 +33,13 @@ abstract class TestCase extends BaseTestCase
     protected function getPackageProviders($app): array
     {
         return [
-            ExtendedRoutesServiceProvider::class,
+            EventServiceProvider::class,
+            LogServiceProvider::class,
+            RoutingServiceProvider::class,
             ServiceProvider::class,
         ];
     }
 
-    protected function resolveApplication()
-    {
-        return tap(new Application($this->getBasePath()), function ($app) {
-            $app->bind(LoadConfiguration::class, OrchestraLoadConfiguration::class);
-
-            PackageManifest::swap($app, $this);
-        });
-    }
-
     protected function defineRoutes($router)
     {
         $router
