[3.x] Laravel 11 support #1180

stancl · 2024-01-27T21:41:59Z

This PR adds Laravel 11 support.

…rted

stancl · 2024-01-27T23:38:39Z

Tried the installation with the new Laravel 11 app skeleton and seems like everything works fine. The only different step is that you need to create an app.php config file and configure the service providers like this:

use Illuminate\Support\ServiceProvider;

return [
    'providers' => ServiceProvider::defaultProviders()->merge([
        App\Providers\TenancyServiceProvider::class,
    ])->toArray(),
];

Will keep this PR open until Laravel 11 release. To test Tenancy 3.x with Laravel 11, you can use:

composer require stancl/tenancy:dev-laravel-11

If you run into any issues, let me know in this thread.

JustSteveKing · 2024-01-28T10:10:31Z

You can add this to the bootstrap/app.php file now as part of the App Builder

->withProviders([
  // Add providers here....
])

nunohelfrich · 2024-02-01T02:04:13Z

What about RouteServiceProvider? Cant acces my tenant's routes, it keeps showing me my central routes.. I recreated Route ServiceProvider from Laravel 10.x and added the changes in the docs but i think the problem is here:

->withRouting(
        web: __DIR__.'/../routes/web.php',
        // api: __DIR__.'/../routes/api.php',
        commands: __DIR__.'/../routes/console.php',
        // channels: __DIR__.'/../routes/channels.php',
        health: '/up',
    )

SamuelNitsche · 2024-02-11T13:47:29Z

What about RouteServiceProvider? Cant acces my tenant's routes, it keeps showing me my central routes.. I recreated Route ServiceProvider from Laravel 10.x and added the changes in the docs but i think the problem is here:
->withRouting(
        web: __DIR__.'/../routes/web.php',
        // api: __DIR__.'/../routes/api.php',
        commands: __DIR__.'/../routes/console.php',
        // channels: __DIR__.'/../routes/channels.php',
        health: '/up',
    )

Did you apply the InitializeTenancyByDomain middleware to the routes? See: https://tenancyforlaravel.com/docs/v3/routes/#tenant-routes

randuran · 2024-03-03T19:25:09Z

What about RouteServiceProvider? Cant acces my tenant's routes, it keeps showing me my central routes.. I recreated Route ServiceProvider from Laravel 10.x and added the changes in the docs but i think the problem is here:
->withRouting(
        web: __DIR__.'/../routes/web.php',
        // api: __DIR__.'/../routes/api.php',
        commands: __DIR__.'/../routes/console.php',
        // channels: __DIR__.'/../routes/channels.php',
        health: '/up',
    )
Did you apply the InitializeTenancyByDomain middleware to the routes? See: https://tenancyforlaravel.com/docs/v3/routes/#tenant-routes

Any progress on this? Laravel 11 does not include a RouteServiceProvider by default

SamuelNitsche · 2024-03-04T08:47:31Z

@randuran See the link I posted above. You can apply the InitializeTenancyByDomain middleware on a route group in your routes/web.php file.

stancl · 2024-03-04T08:49:27Z

Think by default the route SP was used to change central routes — scope them to the central domain.

The tenancy middleware is best to use directly in your tenant routes, yeah.

And without a route SP, you can just scope your central routes to the central domain directly in web.php/api.php. The provider is not needed, it can just simplify your route files.

stancl · 2024-03-12T12:58:07Z

~~Blocked on laravel/framework#50467~~. The change only affects tests, package behavior should be unaffected so this branch is safe to use (composer require stancl/tenancy:dev-laravel-11).

Once we can get the tests to pass I'll merge this into 3.x and tag a release.

zeolimaldonado · 2024-03-13T16:08:46Z

Think by default the route SP was used to change central routes — scope them to the central domain.

The tenancy middleware is best to use directly in your tenant routes, yeah.

And without a route SP, you can just scope your central routes to the central domain directly in web.php/api.php. The provider is not needed, it can just simplify your route files.

It doesn't work at all, i can access to my tenant routes but i can't access to my central routes with the same URI

stancl · 2024-03-13T16:30:27Z

Hmm, this works:

// config/app.php
return [
    'providers' => ServiceProvider::defaultProviders()->merge([
        App\Providers\TenancyServiceProvider::class,
    ])->toArray(),
];

// routes/web.php
Route::domain('l11-test.test')->get('/', function () {
    return view('welcome');
});

// routes/tenant.php
Route::middleware([
    'web',
    InitializeTenancyBySubdomain::class,
    PreventAccessFromCentralDomains::class,
])->group(function () {
    Route::get('/abc', function () {
        return 'This is your multi-tenant application. The id of the current tenant is ' . tenant('id');
    });
});

But when you change /abc to / the central / doesn't seem to work, even though there should be no conflict when domain() is used.

My guess would be the tenant routes get registered after the central routes, which is why it results in a 404 from the PreventAccessFromCentralDomains.

So the Tenancy SP needs to be registered in some way so that it executes after the default route SP.

stancl · 2024-03-13T16:36:07Z

Changing TSP mapRoutes() to:

protected function mapRoutes()
{
    $this->app->booted(function () {
        if (file_exists(base_path('routes/tenant.php'))) {
            Route::namespace(static::$controllerNamespace)
            ->group(base_path('routes/tenant.php'));
        }
    });
}

Seems to work, though I'd like to try a few different solutions before concluding if this is the way to go.

zeolimaldonado · 2024-03-13T16:58:43Z

I did the changes on TSP and it works correctly on routes with web but when i tried to do the same on 'api' it fails

routes/tenant.php

Route::middleware([
    'api',
    InitializeTenancyBySubdomain::class,
    PreventAccessFromCentralDomains::class,
])->group(function () {
    Route::get('/', function () {
        return 'This is your multi-tenant application. The id of the current tenant is ' . tenant('id');
    });
});

routes/api.php

Route::domain('test-app.test')->get('/', function () { return 'welcome'; });

UPDATE:
i move the tenant routes to routes/api.php and it seems to work, tenant needs to be declared after the central routes to work

Route::domain('test-app.test')->get('/', function () {
    return 'welcome from api';
});

Route::middleware([
    InitializeTenancyBySubdomain::class,
    PreventAccessFromCentralDomains::class,
])->group(function () {
    Route::get('/', function () {
        return 'This is the tenant from api ' . tenant('id');
    });
});

mfakhrys · 2024-03-19T07:31:15Z

Just sharing my setup. It works in my project.

Firstly, I add TSP in bootstrap/providers.php file

<?php

return [
    App\Providers\AppServiceProvider::class,
    App\Providers\TenancyServiceProvider::class,
];

Secondly, In TSP, I comment out mapRoutes

public function boot()
{
    $this->bootEvents();
    // $this->mapRoutes();

    $this->makeTenancyMiddlewareHighestPriority();
}

And finally, in bootstrap/app.php file, following the Laravel 11 documentation, i modify withRouting function into:

->withRouting(
    // web: __DIR__.'/../routes/web.php',
    commands: __DIR__ . '/../routes/console.php',
    health: '/up',
    using: function () {
        $centralDomains = config('tenancy.central_domains');

        foreach ($centralDomains as $domain) {
            Route::middleware('web')
                ->domain($domain)
                ->group(base_path('routes/web.php'));
        }

        Route::middleware('web')->group(base_path('routes/tenant.php'));
    }
)

stancl · 2024-03-21T11:49:10Z

The using approach does seem to work, though I believe it overrides the web/api/health/broadcasting/... options for withRouting().

krekas · 2024-03-24T18:16:49Z

Instead of using should use then to add additional route files.
https://laravel.com/docs/11.x/routing#routing-customization

stancl · 2024-03-24T18:17:55Z

This isn't about registering an additional file, that's already possible in the TenancyServiceProvider. We're looking for ways to scope the central routes to central domains in a nice way.

Clareapumami · 2024-03-28T12:16:38Z

Using both @mfakhrys and @stancl codes...
Firstly, I add TSP in bootstrap/providers.php file

<?php

return [
    App\Providers\AppServiceProvider::class,
    App\Providers\TenancyServiceProvider::class,
];

Secondly, in bootstrap/app.php file, following the Laravel 11 documentation, I modify withRouting function into:

 ->withRouting(
        // web: __DIR__.'/../routes/web.php',
        commands: __DIR__.'/../routes/console.php',
        health: '/up',
        using: function () {
            $centralDomains = config('tenancy.central_domains');

            foreach ($centralDomains as $domain) {
                Route::middleware('web')
                    ->domain($domain)
                    ->group(base_path('routes/web.php'));
            }
        }
 )

This overrides the default web routing, but this is exactly what we want to achieve. Api routes will be defined in the same way, but I think an api.php file will have to be included in the routes. I'm not using that.

Finally, in TSP, we change mapRoutes() into

protected function mapRoutes()
{
    $this->app->booted(function () {
        if (file_exists(base_path('routes/tenant.php'))) {
            Route::namespace(static::$controllerNamespace)
            ->group(base_path('routes/tenant.php'));
        }
    });
}

stancl · 2024-03-28T20:37:50Z

Keep this thread Laravel 11-related, support questions go on our Discord.

colinmackinlay · 2024-03-29T11:31:15Z

L11 saas-boilerplate issue I'm wrestling with is the relocation of exception handling from app/Exceptions/Handler.php to bootstrap\app.php

My version of Handler.php has this:

class Handler extends ExceptionHandler
{
    protected $dontReport = [
        TenantCouldNotBeIdentifiedOnDomainException::class,
        NotASubdomainException::class,
    ];

    protected $dontFlash = [
        'current_password',
        'password',
        'password_confirmation',
    ];

    public function render($request, Throwable $e): Response
    {
        if (
            $e instanceof TenantDatabaseDoesNotExistException ||
            (tenant()
                && ! tenant('ready')
                && $e instanceof QueryException)
            ||
            (tenant()
                && ! tenant('ready')
                && $e instanceof ViewException
                && $e->getPrevious() instanceof QueryException)
        ) {
            return response()->view('errors.building');
        }

        if ($e instanceof TenantCouldNotBeIdentifiedException || $e instanceof NotASubdomainException) {
            return to_route('central.landing');
        }

        return parent::render($request, $e);
    }
}

I know it's not quite the latest version but the issues of converting it over to L11 bootstrap/app.php seem to be the same.

Anyone had success with converting a saas-boilerplae based application to L11?

Michael140020 · 2024-04-06T15:39:41Z

This is on purpose, so that you buy the saas boilerplate!

stancl · 2024-04-06T15:45:07Z

The boilerplate doesn't use L11. It will be updated after we have the time to go over all the project structure changes.

yusufkaracaburun · 2024-04-07T09:36:42Z

how did you guys setup your central api routes?
in my web.php I have:
Route::get('/{any}', [AppController::class, 'central'])->where('any', '.*');

and my routing in bootstrap/app.php is like:

->withRouting(
//                web: __DIR__ . '/../routes/web.php',
        api: __DIR__ . '/../routes/api.php',
        commands: __DIR__ . '/../routes/console.php',
        channels: __DIR__ . '/../routes/channels.php',
        health: '/up',
        then: function (): void {
            $centralDomains = config('tenancy.central_domains');

            foreach ($centralDomains as $domain) {
                Route::middleware('web')
                    ->domain($domain)
                    ->group(base_path('routes/web.php'));
            }
        }
    )

so when i e.g. send a request to /api/users, it uses the web.php route instead of the api.php route.

stancl · 2024-04-07T14:21:38Z

If you use top-level .* routes, you need to be careful about the route registration order.

yusufkaracaburun · 2024-04-08T11:18:10Z

No, I want to use it like I use web routes. Is this the correct way, because it works?

    ->withRouting(
        //                web: __DIR__ . '/../routes/web.php',
        //        api: __DIR__ . '/../routes/api.php',
        using: function (): void {
            $centralDomains = config('tenancy.central_domains');

            foreach ($centralDomains as $domain) {
                Route::prefix('api')
                    ->domain($domain)
                    ->middleware('api')
                    ->group(base_path('routes/api.php'));
            }

            foreach ($centralDomains as $domain) {
                Route::middleware('web')
                    ->domain($domain)
                    ->group(base_path('routes/web.php'));
            }

            //            Route::middleware('web')->group(base_path('routes/tenant.php'));
        },
        commands: __DIR__ . '/../routes/console.php',
        channels: __DIR__ . '/../routes/channels.php',
        health: '/up',
    )

geoffreyrose · 2024-04-11T06:59:09Z

Here is what I got to work. Initially tested it in a fresh Laravel 11 install and then the actual project I have. Both seem to work as intended.

First register two additional service providers

// bootstrap/providers.php

<?php

return [
    App\Providers\AppServiceProvider::class,
    App\Providers\RouteServiceProvider::class,
    App\Providers\TenancyServiceProvider::class,
];

Next remove the web routes from being registered in bootstrap/providers.php

// bootstrap/providers.php

<?php

use Illuminate\Foundation\Application;
use Illuminate\Foundation\Configuration\Exceptions;
use Illuminate\Foundation\Configuration\Middleware;

return Application::configure(basePath: dirname(__DIR__))
    ->withRouting(
        // web: __DIR__.'/../routes/web.php',
        commands: __DIR__.'/../routes/console.php',
        health: '/up',
    )
    ->withMiddleware(function (Middleware $middleware) {
        //
    })
    ->withExceptions(function (Exceptions $exceptions) {
        //
    })->create();

Register the web routes, but only for central domains

// app/Providers/RouteServiceProvider.php

<?php

namespace App\Providers;

use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Route;

class RouteServiceProvider extends ServiceProvider
{
    /**
     * The path to the "home" route for your application.
     *
     * Typically, users are redirected here after authentication.
     *
     * @var string
     */
    public const HOME = '/';

    /**
     * Define your route model bindings, pattern filters, and other route configuration.
     */
    public function boot(): void
    {
        $this->routes(function () {
            $this->mapWebRoutes();
        });
    }

    protected function mapWebRoutes()
    {
        foreach ($this->centralDomains() as $domain) {
            Route::middleware('web')
                ->domain($domain)
                ->namespace($this->namespace)
                ->group(base_path('routes/web.php'));
        }
    }

    protected function centralDomains(): array
    {
        return config('tenancy.central_domains', []);
    }
}

// Using the default TenancyServiceProvider, no changes needed there

What seems to do the trick is not registering web in providers.php and do that instead inside of a RouteServiceProvider which will register routes only on the central domains

stancl · 2024-04-12T00:02:18Z

Don't spam ping when asking questions. The approaches outlined above work: you just have to make sure your tenant routes get registered after central routes, either in using or by deferring the tenant route registration as I mentioned above.

I'll update the v3 docs soon to rewrite the installation guide.

stancl · 2024-04-13T22:08:32Z

Docs updated stancl/tenancy-docs@3f60cdb

tiagofrancafernandes · 2024-05-28T14:12:01Z

The using approach does seem to work, though I believe it overrides the web/api/health/broadcasting/... options for withRouting().

It's true.

I believe that using 'then' is more productive.

This way keep 'up/health' and others

ram2228 · 2024-08-28T12:54:22Z

Just sharing my setup. It works in my project.

Firstly, I add TSP in bootstrap/providers.php file

<?php

return [
    App\Providers\AppServiceProvider::class,
    App\Providers\TenancyServiceProvider::class,
];

Secondly, In TSP, I comment out mapRoutes

public function boot()
{
    $this->bootEvents();
    // $this->mapRoutes();

    $this->makeTenancyMiddlewareHighestPriority();
}

And finally, in bootstrap/app.php file, following the Laravel 11 documentation, i modify withRouting function into:

->withRouting(
    // web: __DIR__.'/../routes/web.php',
    commands: __DIR__ . '/../routes/console.php',
    health: '/up',
    using: function () {
        $centralDomains = config('tenancy.central_domains');

        foreach ($centralDomains as $domain) {
            Route::middleware('web')
                ->domain($domain)
                ->group(base_path('routes/web.php'));
        }

        Route::middleware('web')->group(base_path('routes/tenant.php'));
    }
)

ram2228 · 2024-08-28T12:54:43Z

It is working for me

Laravel 11 support

78c751c

stancl marked this pull request as draft January 27, 2024 21:42

wip

cd97bb6

stancl marked this pull request as ready for review January 27, 2024 22:17

stancl added 4 commits January 27, 2024 23:18

trigger ci

287fe01

fix ci file

d60bde6

try setting charset and collation on the default mysql connection

b98db79

Set default cache driver to redis in tests

cdc6e31

stancl marked this pull request as draft January 27, 2024 22:51

stancl added 2 commits January 27, 2024 23:58

drop and recreate id column separately in autoincrement_ids_are_suppo…

d210b77

…rted

set default redis client to predis in tests

f8a86a4

revert fail-fast

11507d2

stancl mentioned this pull request Mar 6, 2024

Does Tenancy support Laravel 11? #1192

Closed

try reverting TenantModelTest change

6dc61f8

stancl marked this pull request as ready for review March 12, 2024 11:45

migrate phpunit configuration

cb6b75e

add parent::tearDown() call

5acb6f5

stancl merged commit 72b1b48 into 3.x Mar 12, 2024
3 checks passed

stancl deleted the laravel-11 branch March 12, 2024 14:04

joelstein mentioned this pull request Mar 27, 2024

how to configure tenancy for Laravel on Laravel 11 version #1201

Closed

stancl mentioned this pull request Mar 27, 2024

Laravel 11 cannot access subdomain on multi-database setup #1202

Closed

This comment was marked as off-topic.

Sign in to view

This comment was marked as spam.

Sign in to view

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[3.x] Laravel 11 support #1180

[3.x] Laravel 11 support #1180

stancl commented Jan 27, 2024 •

edited

Loading

stancl commented Jan 27, 2024

JustSteveKing commented Jan 28, 2024

nunohelfrich commented Feb 1, 2024

SamuelNitsche commented Feb 11, 2024

randuran commented Mar 3, 2024

SamuelNitsche commented Mar 4, 2024

stancl commented Mar 4, 2024

stancl commented Mar 12, 2024 •

edited

Loading

zeolimaldonado commented Mar 13, 2024

stancl commented Mar 13, 2024

stancl commented Mar 13, 2024

zeolimaldonado commented Mar 13, 2024 •

edited

Loading

mfakhrys commented Mar 19, 2024 •

edited

Loading

stancl commented Mar 21, 2024

krekas commented Mar 24, 2024

stancl commented Mar 24, 2024

Clareapumami commented Mar 28, 2024

This comment was marked as off-topic.

stancl commented Mar 28, 2024

colinmackinlay commented Mar 29, 2024

Michael140020 commented Apr 6, 2024

stancl commented Apr 6, 2024

yusufkaracaburun commented Apr 7, 2024 •

edited

Loading

stancl commented Apr 7, 2024

yusufkaracaburun commented Apr 8, 2024 •

edited

Loading

geoffreyrose commented Apr 11, 2024 •

edited

Loading

This comment was marked as spam.

stancl commented Apr 12, 2024 •

edited

Loading

stancl commented Apr 13, 2024

tiagofrancafernandes commented May 28, 2024

ram2228 commented Aug 28, 2024

ram2228 commented Aug 28, 2024

[3.x] Laravel 11 support #1180

[3.x] Laravel 11 support #1180

Conversation

stancl commented Jan 27, 2024 • edited Loading

stancl commented Jan 27, 2024

JustSteveKing commented Jan 28, 2024

nunohelfrich commented Feb 1, 2024

SamuelNitsche commented Feb 11, 2024

randuran commented Mar 3, 2024

SamuelNitsche commented Mar 4, 2024

stancl commented Mar 4, 2024

stancl commented Mar 12, 2024 • edited Loading

zeolimaldonado commented Mar 13, 2024

stancl commented Mar 13, 2024

stancl commented Mar 13, 2024

zeolimaldonado commented Mar 13, 2024 • edited Loading

mfakhrys commented Mar 19, 2024 • edited Loading

stancl commented Mar 21, 2024

krekas commented Mar 24, 2024

stancl commented Mar 24, 2024

Clareapumami commented Mar 28, 2024

This comment was marked as off-topic.

stancl commented Mar 28, 2024

colinmackinlay commented Mar 29, 2024

Michael140020 commented Apr 6, 2024

stancl commented Apr 6, 2024

yusufkaracaburun commented Apr 7, 2024 • edited Loading

stancl commented Apr 7, 2024

yusufkaracaburun commented Apr 8, 2024 • edited Loading

geoffreyrose commented Apr 11, 2024 • edited Loading

This comment was marked as spam.

stancl commented Apr 12, 2024 • edited Loading

stancl commented Apr 13, 2024

tiagofrancafernandes commented May 28, 2024

ram2228 commented Aug 28, 2024

ram2228 commented Aug 28, 2024

stancl commented Jan 27, 2024 •

edited

Loading

stancl commented Mar 12, 2024 •

edited

Loading

zeolimaldonado commented Mar 13, 2024 •

edited

Loading

mfakhrys commented Mar 19, 2024 •

edited

Loading

yusufkaracaburun commented Apr 7, 2024 •

edited

Loading

yusufkaracaburun commented Apr 8, 2024 •

edited

Loading

geoffreyrose commented Apr 11, 2024 •

edited

Loading

stancl commented Apr 12, 2024 •

edited

Loading