wip

composer.json

@@ -47,7 +47,11 @@
  "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
  },
  "config": {
- "sort-packages": true
+ "sort-packages": true,
+ "allow-plugins": {
+ "phpstan/extension-installer": true,
+ "pestphp/pest-plugin": true
+ }
  },
  "extra": {
  "laravel": {

config/route-discovery.php

@@ -23,13 +23,14 @@
  *
  * In most cases, you shouldn't change these
  */
- 'node_tree_transformers' => [
- Spatie\RouteDiscovery\NodeTransformers\AddControllerUriToActions::class,
- Spatie\RouteDiscovery\NodeTransformers\HandleCustomRouteName::class,
- Spatie\RouteDiscovery\NodeTransformers\HandleCustomMiddleware::class,
- Spatie\RouteDiscovery\NodeTransformers\HandleCustomHttpMethods::class,
- Spatie\RouteDiscovery\NodeTransformers\FixUrisOfNestedControllers::class,
- Spatie\RouteDiscovery\NodeTransformers\HandleCustomUri::class,
- Spatie\RouteDiscovery\NodeTransformers\HandleCustomFullUri::class,
- ]
+ 'pending_route_transformers' => [
+ Spatie\RouteDiscovery\PendingRouteTransformers\AddControllerUriToActions::class,
+ Spatie\RouteDiscovery\PendingRouteTransformers\HandleDoNotDiscover::class,
+ Spatie\RouteDiscovery\PendingRouteTransformers\HandleCustomRouteName::class,
+ Spatie\RouteDiscovery\PendingRouteTransformers\HandleCustomMiddleware::class,
+ Spatie\RouteDiscovery\PendingRouteTransformers\HandleCustomHttpMethods::class,
+ Spatie\RouteDiscovery\PendingRouteTransformers\FixUrisOfNestedControllers::class,
+ Spatie\RouteDiscovery\PendingRouteTransformers\HandleCustomUri::class,
+ Spatie\RouteDiscovery\PendingRouteTransformers\HandleCustomFullUri::class,
+ ],
 ];

docs/discovering-routes-for-controllers/mapping-controllers-to-urls.md

@@ -18,7 +18,6 @@ class NewsController
 }
 ```
 
-
 Of course, multiple methods in a controller will result in multiple routes being registered.
 
 For this controller, `/news/my-method` and `/news/my-other-method` routes will be registered.

src/Attributes/RouteAttribute.php → src/Attributes/DiscoveryAttribute.php

@@ -2,6 +2,6 @@
 
 namespace Spatie\RouteDiscovery\Attributes;
 
-interface RouteAttribute
+interface DiscoveryAttribute
 {
 }

src/Attributes/DoNotDiscover.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Spatie\RouteDiscovery\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS|Attribute::TARGET_METHOD)]
+class DoNotDiscover implements DiscoveryAttribute
+{
+
+}

src/Attributes/Prefix.php

@@ -5,7 +5,7 @@
 use Attribute;
 
 #[Attribute(Attribute::TARGET_CLASS)]
-class Prefix implements RouteAttribute
+class Prefix implements DiscoveryAttribute
 {
  public function __construct(
  public string $prefix

src/Attributes/Route.php

@@ -7,7 +7,7 @@
 use Illuminate\Support\Arr;
 
 #[Attribute(Attribute::TARGET_METHOD)]
-class Route implements RouteAttribute
+class Route implements DiscoveryAttribute
 {
  /** @var array<int, string> */
  public array $methods;

src/PendingRouteTransformers/AddControllerUriToActions.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Spatie\RouteDiscovery\PendingRouteTransformers;
+
+use Illuminate\Support\Collection;
+use Spatie\RouteDiscovery\PendingRoutes\PendingRouteAction;
+use Spatie\RouteDiscovery\PendingRoutes\PendingRoute;
+
+class AddControllerUriToActions implements PendingRouteTransformer
+{
+ /**
+ * @param Collection<PendingRoute> $pendingRoutes
+ *
+ * @return Collection<PendingRoute>
+ */
+ public function transform(Collection $pendingRoutes): Collection
+ {
+ $pendingRoutes->each(function (PendingRoute $pendingRoute) {
+ $pendingRoute->actions->each(function (PendingRouteAction $action) use ($pendingRoute) {
+ $originalActionUri = $action->uri;
+
+ $action->uri = $pendingRoute->uri;
+
+ if ($originalActionUri) {
+ $action->uri .= "/{$originalActionUri}";
+ }
+ });
+ });
+
+ return $pendingRoutes;
+ }
+}