Skip to content

Commit 0da113f

Browse files
committed
Upgrade to Symfony ^4.0
(based on silexphp#132)
1 parent 57488d3 commit 0da113f

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

WebProfilerServiceProvider.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public function register(Container $app)
237237
}
238238

239239
$app['web_profiler.controller.profiler'] = function ($app) use ($baseDir) {
240-
return new ProfilerController($app['url_generator'], $app['profiler'], $app['twig'], $app['data_collector.templates'], $app['web_profiler.debug_toolbar.position'], null, $baseDir);
240+
return new ProfilerController($app['url_generator'], $app['profiler'], $app['twig'], $app['data_collector.templates'], null, $baseDir);
241241
};
242242

243243
$app['web_profiler.controller.router'] = function ($app) {
@@ -251,7 +251,7 @@ public function register(Container $app)
251251
$app['web_profiler.toolbar.listener'] = function ($app) {
252252
$mode = $app['web_profiler.debug_toolbar.enable'] ? WebDebugToolbarListener::ENABLED : WebDebugToolbarListener::DISABLED;
253253

254-
return new WebDebugToolbarListener($app['twig'], $app['web_profiler.debug_toolbar.intercept_redirects'], $mode, $app['web_profiler.debug_toolbar.position'], $app['url_generator']);
254+
return new WebDebugToolbarListener($app['twig'], $app['web_profiler.debug_toolbar.intercept_redirects'], $mode, $app['url_generator']);
255255
};
256256

257257
$app['profiler'] = function ($app) {
@@ -272,7 +272,6 @@ public function register(Container $app)
272272
$app['profiler.only_exceptions'] = false;
273273
$app['profiler.only_master_requests'] = false;
274274
$app['web_profiler.debug_toolbar.enable'] = true;
275-
$app['web_profiler.debug_toolbar.position'] = 'bottom';
276275
$app['web_profiler.debug_toolbar.intercept_redirects'] = false;
277276

278277
$app['profiler.listener'] = function ($app) {

composer.json

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,19 @@
1111
],
1212
"require": {
1313
"silex/silex": "^2.0",
14-
"symfony/web-profiler-bundle": "^2.8|^3.0",
15-
"symfony/twig-bundle": "^2.8|^3.0",
16-
"symfony/twig-bridge": "^2.8|^3.0",
17-
"symfony/stopwatch": "^2.8|^3.0"
18-
},
19-
"conflict": {
20-
"symfony/web-profiler-bundle": "3.1.0"
14+
"symfony/web-profiler-bundle": "^4.0",
15+
"symfony/twig-bundle": "^4.0",
16+
"symfony/twig-bridge": "^4.0",
17+
"symfony/stopwatch": "^4.0"
2118
},
2219
"require-dev": {
23-
"symfony/browser-kit": "^2.8|^3.0",
24-
"symfony/css-selector": "^2.8|^3.0",
25-
"symfony/debug-bundle": "^2.8|^3.0",
26-
"symfony/phpunit-bridge": "~3.2",
27-
"symfony/security": "^2.8|^3.0",
28-
"symfony/security-bundle": "^2.8|^3.0",
29-
"symfony/translation": "^2.8|^3.0"
20+
"symfony/browser-kit": "^4.0",
21+
"symfony/css-selector": "^4.0",
22+
"symfony/debug-bundle": "^4.0",
23+
"symfony/phpunit-bridge": "^4.0",
24+
"symfony/security": "^4.0",
25+
"symfony/security-bundle": "^4.0",
26+
"symfony/translation": "^4.0"
3027
},
3128
"autoload": {
3229
"psr-4": { "Silex\\Provider\\": "" }

0 commit comments

Comments
 (0)