Skip to content

Commit 29b6f86

Browse files
committed
feature #477 Update to Symfony 3.2.4 and start supporting Twig 2 (bocharsky-bw)
This PR was squashed before being merged into the master branch (closes #477). Discussion ---------- Update to Symfony 3.2.4 and start supporting Twig 2 Symfony SE already do it: symfony/symfony-standard#1045 - Updating symfony/symfony (v3.2.3 => v3.2.4) Downloading: 100% - Installing ircmaxell/password-compat (v1.0.4) Loading from cache - Installing symfony/polyfill-php55 (v1.3.0) Loading from cache - Updating sensio/framework-extra-bundle (v3.0.21 => v3.0.22) Downloading: 100% - Updating white-october/pagerfanta-bundle (v1.0.7 => v1.0.8) Downloading: 100% - Updating friendsofphp/php-cs-fixer (v2.0.0 => v2.1.0) Downloading: 100% - Updating symfony/phpunit-bridge (v3.2.3 => v3.2.4) Loading from cache - Updating doctrine/dbal (v2.5.11 => v2.5.12) Loading from cache - Updating swiftmailer/swiftmailer (v5.4.5 => v5.4.6) Downloading: 100% Commits ------- b6e7c78 Update to Symfony 3.2.4 and start supporting Twig 2
2 parents a42c007 + b6e7c78 commit 29b6f86

File tree

2 files changed

+141
-46
lines changed

2 files changed

+141
-46
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"symfony/swiftmailer-bundle" : "^2.3",
2828
"symfony/symfony" : "^3.2",
2929
"twig/extensions" : "^1.3",
30-
"twig/twig" : "^1.28",
30+
"twig/twig" : "^1.28 || ^2.0",
3131
"white-october/pagerfanta-bundle" : "^1.0"
3232
},
3333
"require-dev": {

composer.lock

Lines changed: 140 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)