Make universal routes work for controller middleware (#1151)

* Make universal routes work for controller middleware

* add a fallback

---------

Co-authored-by: chillbram <[email protected]>
Co-authored-by: Samuel Štancl <[email protected]>

Author: chillbram

src/Features/UniversalRoutes.php

@@ -35,7 +35,7 @@ public function bootstrap(Tenancy $tenancy): void
 
     public static function routeHasMiddleware(Route $route, $middleware): bool
     {
-        if (in_array($middleware, $route->middleware(), true)) {
+        if (in_array($middleware, $route->computedMiddleware ?? $route->middleware(), true)) {
             return true;
         }
 

tests/UniversalRouteTest.php

@@ -63,4 +63,46 @@ public function making_one_route_universal_doesnt_make_all_routes_universal()
             ->assertSuccessful()
             ->assertSee('acme');
     }
+
+    /** @test */
+    public function universal_route_works_when_middleware_is_inserted_via_controller_middleware()
+    {
+        Route::middlewareGroup('universal', []);
+        config(['tenancy.features' => [UniversalRoutes::class]]);
+
+        Route::get('/foo', [UniversalRouteController::class, 'show']);
+
+        $this->get('http://localhost/foo')
+            ->assertSuccessful()
+            ->assertSee('Tenancy is not initialized.');
+
+        $tenant = Tenant::create([
+            'id' => 'acme',
+        ]);
+        $tenant->domains()->create([
+            'domain' => 'acme.localhost',
+        ]);
+
+        $this->get('http://acme.localhost/foo')
+            ->assertSuccessful()
+            ->assertSee('Tenancy is initialized.');
+    }
+}
+
+class UniversalRouteController
+{
+    public function getMiddleware()
+    {
+        return array_map(fn($middleware) => [
+            'middleware' => $middleware,
+            'options' => [],
+        ], ['universal', InitializeTenancyByDomain::class]);
+    }
+
+    public function show()
+    {
+        return tenancy()->initialized
+            ? 'Tenancy is initialized.'
+            : 'Tenancy is not initialized.';
+    }
 }