Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "[8.x] Change loadRoutesFrom to accept group $attributes" #34909

Merged
merged 1 commit into from Oct 20, 2020
Merged

Revert "[8.x] Change loadRoutesFrom to accept group $attributes" #34909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/Illuminate/Support/ServiceProvider.php
View file
Open in desktop
Expand Up @@ -8,7 +8,6 @@
use Illuminate\Contracts\Foundation\CachesRoutes;
use Illuminate\Contracts\Support\DeferrableProvider;
use Illuminate\Database\Eloquent\Factory as ModelFactory;
use Illuminate\Support\Facades\Route;
use Illuminate\View\Compilers\BladeCompiler;

abstract class ServiceProvider
Expand Down Expand Up @@ -137,14 +136,12 @@ protected function mergeConfigFrom($path, $key)
* Load the given routes file if routes are not already cached.
*
* @param string $path
* @param array $attributes
*
* @return void
*/
protected function loadRoutesFrom($path, array $attributes = [])
protected function loadRoutesFrom($path)
{
if (! ($this->app instanceof CachesRoutes && $this->app->routesAreCached())) {
Route::group($attributes, $path);
require $path;
}
}

Expand Down