Skip to content

Commit ac74880

Browse files
committed
remove automatic middleware registration
1 parent 8b0136c commit ac74880

File tree

5 files changed

+0
-103
lines changed

5 files changed

+0
-103
lines changed

config/laravel-page-speed.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,4 @@
5656
'*.m4v',
5757
'*.torrent'
5858
],
59-
60-
/*
61-
|--------------------------------------------------------------------------
62-
| Disabled Middlewares
63-
|--------------------------------------------------------------------------
64-
|
65-
| Middlewares to exclude. Using the Package Auto-Discovery.
66-
| Specify class name.
67-
|
68-
*/
69-
'disabled_middlewares' => [
70-
//
71-
],
7259
];

src/ServiceProvider.php

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@
22

33
namespace RenatoMarinho\LaravelPageSpeed;
44

5-
use Illuminate\Contracts\Http\Kernel;
65
use Illuminate\Support\ServiceProvider as BaseServiceProvider;
76

87
class ServiceProvider extends BaseServiceProvider
98
{
10-
private const MIDDLEWARES_PATH = __DIR__ . DIRECTORY_SEPARATOR . 'Middleware/';
11-
private const MIDDLEWARES_NAMESPACE = 'RenatoMarinho\\LaravelPageSpeed\\Middleware\\';
12-
private const ABSTRACT_MIDDLEWARE_PATH = 'RenatoMarinho\LaravelPageSpeed\Middleware\PageSpeed';
13-
149
/**
1510
* Indicates if loading of the provider is deferred.
1611
*
@@ -26,8 +21,6 @@ public function boot()
2621
$this->publishes([
2722
__DIR__.'/../config/laravel-page-speed.php' => config_path('laravel-page-speed.php'),
2823
]);
29-
30-
$this->registerMiddlewares();
3124
}
3225

3326
/**
@@ -37,36 +30,4 @@ public function register()
3730
{
3831
$this->mergeConfigFrom(__DIR__.'/../config/laravel-page-speed.php', 'laravel-page-speed.php');
3932
}
40-
41-
/**
42-
* Register package middlewares.
43-
*/
44-
protected function registerMiddlewares()
45-
{
46-
$middlewares = collect($this->getMiddlewares())
47-
->diff(config('laravel-page-speed.disabled_middlewares', []))
48-
->reject(function ($middleware) {
49-
return $middleware === self::ABSTRACT_MIDDLEWARE_PATH;
50-
});
51-
52-
foreach ($middlewares as $middleware) {
53-
$this->app[Kernel::class]->pushMiddleware($middleware);
54-
}
55-
}
56-
57-
private function getMiddlewares()
58-
{
59-
$middlewaresFiles = glob(self::MIDDLEWARES_PATH . '*.php');
60-
61-
return array_map(function ($middleware) {
62-
return $this->transformMiddlewareFilePathToNamespace($middleware);
63-
}, $middlewaresFiles);
64-
}
65-
66-
private function transformMiddlewareFilePathToNamespace(string $middlewareFile)
67-
{
68-
$middlewareFile = str_replace('.php', '', $middlewareFile);
69-
70-
return str_replace(self::MIDDLEWARES_PATH, self::MIDDLEWARES_NAMESPACE, $middlewareFile);
71-
}
7233
}

tests/Config/DisabledMiddlewareIsEmptyTest.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/Config/DisabledMiddlewareTest.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/TestCase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,5 @@ protected function getEnvironmentSetUp($app)
5151
{
5252
config(['laravel-page-speed.enable' => true]);
5353
config(['laravel-page-speed.skip' => []]);
54-
config(['laravel-page-speed.disabled_middlewares' => []]);
5554
}
5655
}

0 commit comments

Comments
 (0)