Merge pull request #7 from TheDragonCode/1.x

Expanded list of collisions

Author: Andrey Helldar

README.md

@@ -18,7 +18,8 @@ composer require dragon-code/laravel-route-names
 
 Next, replace `Illuminate\Foundation\Application` with `DragonCode\LaravelRouteNames\Application` in the `bootstrap/app.php` file.
 
-You can now list the routes, for example by calling the `php artisan route:list` command or by using the [`dragon-code/pretty-routes`](https://github.com/TheDragonCode/pretty-routes) package.
+You can now list the routes, for example by calling the `php artisan route:list` command or by using
+the [`dragon-code/pretty-routes`](https://github.com/TheDragonCode/pretty-routes) package.
 
 ## Using
 
@@ -34,29 +35,12 @@ Since route names are generated at the time they are received, we recommend usin
 
 ```bash
 php artisan route:cache
-```
 
-or
+// or
 
-```bash
 php artisan optimize
 ```
 
-For example:
-
-```php
-app('router')
-    ->get('pages', [IndexController::class, 'index'])
-    ->name('my_pages');
-
-return route('my_pages');
-//  \Symfony\Component\Routing\Exception\RouteNotFoundException
-//  Route [my_pages] not defined.
-
-return route('pages.index');
-// Returns the result of executing the `IndexController@index` method.
-```
-
 ### Base Routes
 
 ```php
@@ -122,6 +106,21 @@ app('router')->apiResource('authors/{author}/photos', Author\PhotoController::cl
 | PATCH     | `/authors/123/photos/{photo}` | `authors.photos.patch`   | `route('authors.photos.patch')`   |
 | DELETE    | `/authors/123/photos/{photo}` | `authors.photos.destroy` | `route('authors.photos.destroy')` |
 
+### Exceptions
+
+```php
+app('router')
+    ->get('pages', [IndexController::class, 'index'])
+    ->name('my_pages');
+
+return route('my_pages');
+//  \Symfony\Component\Routing\Exception\RouteNotFoundException
+//  Route [my_pages] not defined.
+
+return route('pages.index');
+// Returns the result of executing the `IndexController@index` method.
+```
+
 ## Result
 
 ```php

composer.json

@@ -26,6 +26,7 @@
         "illuminate/routing": "^7.0 || ^8.0 || ^9.0"
     },
     "require-dev": {
+        "dragon-code/extended-routes": "^3.1",
         "orchestra/testbench": "^5.0 || ^6.0 || ^7.0",
         "phpunit/phpunit": "^9.5"
     },

src/Helpers/Action.php

@@ -24,6 +24,8 @@ class Action
         'edit'    => [RequestMethodInterface::METHOD_GET, RequestMethodInterface::METHOD_HEAD],
         'destroy' => [RequestMethodInterface::METHOD_DELETE],
         'delete'  => [RequestMethodInterface::METHOD_DELETE],
+        'trashed' => [RequestMethodInterface::METHOD_GET, RequestMethodInterface::METHOD_HEAD],
+        'restore' => [RequestMethodInterface::METHOD_POST],
     ];
 
     protected array $show = [RequestMethodInterface::METHOD_GET, RequestMethodInterface::METHOD_HEAD];

tests/Concerns/Routes.php

@@ -7,6 +7,7 @@
 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
@@ -108,6 +109,8 @@ 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

tests/Http/Controllers/RestorableResourceController.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Http\Controllers;
+
+use Illuminate\Routing\Controller as BaseController;
+
+class RestorableResourceController extends BaseController
+{
+    public function __invoke()
+    {
+    }
+}

tests/Routes/ResourcesTest.php

@@ -5,6 +5,7 @@
 namespace Tests\Routes;
 
 use Tests\Http\Controllers\ApiResourceController;
+use Tests\Http\Controllers\RestorableResourceController;
 use Tests\Http\Controllers\WebResourceController;
 use Tests\TestCase;
 
@@ -29,4 +30,15 @@ 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));
+    }
 }

tests/TestCase.php

@@ -16,6 +16,7 @@
 
 namespace Tests;
 
+use DragonCode\ExtendedRoutes\ServiceProvider as ExtendedRoutesServiceProvider;
 use DragonCode\LaravelRouteNames\Application;
 use DragonCode\LaravelRouteNames\ServiceProvider;
 use Illuminate\Foundation\Bootstrap\LoadConfiguration;
@@ -32,7 +33,10 @@ abstract class TestCase extends BaseTestCase
 
     protected function getPackageProviders($app): array
     {
-        return [ServiceProvider::class];
+        return [
+            ExtendedRoutesServiceProvider::class,
+            ServiceProvider::class,
+        ];
     }
 
     protected function resolveApplication()