Skip to content
This repository was archived by the owner on Sep 14, 2018. It is now read-only.

Commit 25c0433

Browse files
committed
[Fixes #131] Upgrade to Symfony 4
1 parent 57488d3 commit 25c0433

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

.travis.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@ cache:
99

1010
matrix:
1111
include:
12-
- php: 5.5
13-
- php: 5.6
14-
- php: 7.0
1512
- php: 7.1
16-
env: SYMFONY_DEPS_VERSION=3
17-
- php: hhvm
13+
- php: 7.2
1814

1915
before_script:
20-
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '3.0' ]; then sed -i 's/~2\.8|3\.0\.\*/3.0.*@dev/g' composer.json; composer update; fi"
21-
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '' ]; then sed -i 's/~2\.8|3\.0\.\*/2.8.*@dev/g' composer.json; composer update; fi"
2216
- travis_retry composer install
2317

2418
script:

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: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,23 @@
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"
14+
"symfony/web-profiler-bundle": "^4.0",
15+
"symfony/twig-bundle": "^4.0",
16+
"symfony/twig-bridge": "^4.0",
17+
"symfony/stopwatch": "^4.0"
1818
},
1919
"conflict": {
2020
"symfony/web-profiler-bundle": "3.1.0"
2121
},
2222
"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"
23+
"phpunit/phpunit": "4.x|5.x|6.x",
24+
"symfony/browser-kit": "^4.0",
25+
"symfony/css-selector": "^4.0",
26+
"symfony/debug-bundle": "^4.0",
27+
"symfony/phpunit-bridge": "^4.0",
28+
"symfony/security": "^4.0",
29+
"symfony/security-bundle": "^4.0",
30+
"symfony/translation": "^4.0"
3031
},
3132
"autoload": {
3233
"psr-4": { "Silex\\Provider\\": "" }

0 commit comments

Comments
 (0)