Converted middlewares definition array to a Collection

This commit is contained in:
Chris Kankiewicz
2020-05-12 14:02:31 -07:00
parent f4212de655
commit 2e1c28b8ee
2 changed files with 12 additions and 14 deletions

View File

@@ -4,6 +4,8 @@ use App\Factories;
use App\Middlewares;
use App\SortMethods;
use App\ViewFunctions;
use Middlewares as HttpMiddlewares;
use Psr\Container\ContainerInterface;
use Tightenco\Collect\Support\Collection;
return [
@@ -20,10 +22,13 @@ return [
/** Array of application files (to be hidden) */
'app_files' => ['app', 'index.php', '.hidden'],
/** Array of application middlewares */
'middlewares' => [
Middlewares\WhoopsMiddleware::class
],
/** Collection of application middlewares */
'middlewares' => function (ContainerInterface $container): Collection {
return Collection::make([
Middlewares\WhoopsMiddleware::class,
new HttpMiddlewares\Expires($container->get('http_expires')),
]);
},
/** Array of sort options mapped to their respective classes */
'sort_methods' => [

View File

@@ -2,11 +2,8 @@
namespace App\Bootstrap;
use App\Middlewares;
use DI\Container;
use Middlewares as HttpMiddlewares;
use Slim\App;
use Tightenco\Collect\Support\Collection;
class MiddlewareManager
{
@@ -33,16 +30,12 @@ class MiddlewareManager
*
* @return void
*/
public function __invoke()
public function __invoke(): void
{
Collection::make($this->container->get('middlewares'))->each(
function (string $middleware): void {
$this->container->get('middlewares')->each(
function ($middleware): void {
$this->app->add($middleware);
}
);
$this->app->add(new HttpMiddlewares\Expires(
$this->container->get('http_expires')
));
}
}