Skip to content

Commit 1d188d1

Browse files
danmichaelomnapoli
authored andcommitted
Fix #8 Support PHP 5.5 (#14)
1 parent 977f65b commit 1d188d1

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
language: php
22

33
php:
4+
- 5.5
45
- 5.6
56
- 7.0
67
- hhvm
78

89
matrix:
910
include:
10-
- php: 5.6
11+
- php: 5.5
1112
env: dependencies=lowest
1213

1314
sudo: false

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
}
1515
},
1616
"require": {
17-
"php": "~5.6|~7.0",
17+
"php": "~5.5|~7.0",
1818
"php-di/php-di": "^5.2.0",
1919
"php-di/invoker": "^1.2.0",
2020
"slim/slim": "^3.2.1"
2121
},
2222
"require-dev": {
23-
"phpunit/phpunit": "~5.1"
23+
"phpunit/phpunit": "~4.8"
2424
}
2525
}

src/config.php

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
use Slim\Http\Headers;
1313
use Slim\Http\Request;
1414
use Slim\Http\Response;
15-
use function DI\get;
16-
use function DI\object;
1715

1816
return [
1917

@@ -27,23 +25,23 @@
2725
'settings.routerCacheFile' => false,
2826

2927
'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'),
3735
],
3836

3937
// 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),
4745
'environment' => function () {
4846
return new Slim\Http\Environment($_SERVER);
4947
},
@@ -55,8 +53,8 @@
5553
$response = new Response(200, $headers);
5654
return $response->withProtocolVersion($c->get('settings')['httpVersion']);
5755
},
58-
'foundHandler' => object(ControllerInvoker::class)
59-
->constructor(get('foundHandler.invoker')),
56+
'foundHandler' => DI\object(ControllerInvoker::class)
57+
->constructor(DI\get('foundHandler.invoker')),
6058
'foundHandler.invoker' => function (ContainerInterface $c) {
6159
$resolvers = [
6260
// Inject parameters by name first
@@ -69,9 +67,9 @@
6967
return new Invoker(new ResolverChain($resolvers), $c);
7068
},
7169

72-
'callableResolver' => object(CallableResolver::class),
70+
'callableResolver' => DI\object(CallableResolver::class),
7371

7472
// Aliases
75-
ContainerInterface::class => get(Container::class),
73+
ContainerInterface::class => DI\get(Container::class),
7674

7775
];

0 commit comments

Comments
 (0)