|
12 | 12 | use Slim\Http\Headers;
|
13 | 13 | use Slim\Http\Request;
|
14 | 14 | use Slim\Http\Response;
|
15 |
| -use function DI\get; |
16 |
| -use function DI\object; |
17 | 15 |
|
18 | 16 | return [
|
19 | 17 |
|
|
27 | 25 | 'settings.routerCacheFile' => false,
|
28 | 26 |
|
29 | 27 | 'settings' => [
|
30 |
| - 'httpVersion' => get('settings.httpVersion'), |
31 |
| - 'responseChunkSize' => get('settings.responseChunkSize'), |
32 |
| - 'outputBuffering' => get('settings.outputBuffering'), |
33 |
| - 'determineRouteBeforeAppMiddleware' => get('settings.determineRouteBeforeAppMiddleware'), |
34 |
| - 'displayErrorDetails' => get('settings.displayErrorDetails'), |
35 |
| - 'addContentLengthHeader' => get('settings.addContentLengthHeader'), |
36 |
| - 'routerCacheFile' => get('settings.routerCacheFile'), |
| 28 | + 'httpVersion' => DI\get('settings.httpVersion'), |
| 29 | + 'responseChunkSize' => DI\get('settings.responseChunkSize'), |
| 30 | + 'outputBuffering' => DI\get('settings.outputBuffering'), |
| 31 | + 'determineRouteBeforeAppMiddleware' => DI\get('settings.determineRouteBeforeAppMiddleware'), |
| 32 | + 'displayErrorDetails' => DI\get('settings.displayErrorDetails'), |
| 33 | + 'addContentLengthHeader' => DI\get('settings.addContentLengthHeader'), |
| 34 | + 'routerCacheFile' => DI\get('settings.routerCacheFile'), |
37 | 35 | ],
|
38 | 36 |
|
39 | 37 | // Default Slim services
|
40 |
| - 'router' => object(Slim\Router::class), |
41 |
| - 'errorHandler' => object(Slim\Handlers\Error::class) |
42 |
| - ->constructor(get('settings.displayErrorDetails')), |
43 |
| - 'phpErrorHandler' => object(Slim\Handlers\PhpError::class) |
44 |
| - ->constructor(get('settings.displayErrorDetails')), |
45 |
| - 'notFoundHandler' => object(Slim\Handlers\NotFound::class), |
46 |
| - 'notAllowedHandler' => object(Slim\Handlers\NotAllowed::class), |
| 38 | + 'router' => DI\object(Slim\Router::class), |
| 39 | + 'errorHandler' => DI\object(Slim\Handlers\Error::class) |
| 40 | + ->constructor(DI\get('settings.displayErrorDetails')), |
| 41 | + 'phpErrorHandler' => DI\object(Slim\Handlers\PhpError::class) |
| 42 | + ->constructor(DI\get('settings.displayErrorDetails')), |
| 43 | + 'notFoundHandler' => DI\object(Slim\Handlers\NotFound::class), |
| 44 | + 'notAllowedHandler' => DI\object(Slim\Handlers\NotAllowed::class), |
47 | 45 | 'environment' => function () {
|
48 | 46 | return new Slim\Http\Environment($_SERVER);
|
49 | 47 | },
|
|
55 | 53 | $response = new Response(200, $headers);
|
56 | 54 | return $response->withProtocolVersion($c->get('settings')['httpVersion']);
|
57 | 55 | },
|
58 |
| - 'foundHandler' => object(ControllerInvoker::class) |
59 |
| - ->constructor(get('foundHandler.invoker')), |
| 56 | + 'foundHandler' => DI\object(ControllerInvoker::class) |
| 57 | + ->constructor(DI\get('foundHandler.invoker')), |
60 | 58 | 'foundHandler.invoker' => function (ContainerInterface $c) {
|
61 | 59 | $resolvers = [
|
62 | 60 | // Inject parameters by name first
|
|
69 | 67 | return new Invoker(new ResolverChain($resolvers), $c);
|
70 | 68 | },
|
71 | 69 |
|
72 |
| - 'callableResolver' => object(CallableResolver::class), |
| 70 | + 'callableResolver' => DI\object(CallableResolver::class), |
73 | 71 |
|
74 | 72 | // Aliases
|
75 |
| - ContainerInterface::class => get(Container::class), |
| 73 | + ContainerInterface::class => DI\get(Container::class), |
76 | 74 |
|
77 | 75 | ];
|
0 commit comments