Skip to content

Commit 871e878

Browse files
committed
bugfix #146 Replace "twig/twig" requirement with "symfony/twig-bundle" (phansys)
This PR was merged into the master branch. Discussion ---------- |Q |A | |--- |--- | |Branch |master| |Bug fix? |yes | |New feature? |no | |BC breaks? |no | |Deprecations?|no | |Tests pass? |yes | |Fixed tickets|n/a | |License |MIT | |Doc PR |n/a | * "symfony/twig-bundle" is required to call `render()` from controllers; * "twig/twig" was moved to `conflict` section with the constraint `<1.34` in order to ensure its namespaced classes are available. Commits ------- 0723634 Replace "twig/twig" requirement with "symfony/twig-bundle"
2 parents 035d8e3 + 0723634 commit 871e878

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"symfony/options-resolver": "^2.8 || ^3.0 || ^4.0",
4141
"symfony/security-bundle": "^2.8 || ^3.0 || ^4.0",
4242
"symfony/translation": "^2.8 || ^3.0 || ^4.0",
43+
"symfony/twig-bundle": "^2.8 || ^3.0 || ^4.0",
4344
"symfony/validator": "^2.8 || ^3.0 || ^4.0",
44-
"symfony/yaml": "^2.8 || ^3.0 || ^4.0",
45-
"twig/twig": "^1.34 || ^2.0"
45+
"symfony/yaml": "^2.8 || ^3.0 || ^4.0"
4646
},
4747
"require-dev": {
4848
"ext-pdo_sqlite": "*",
@@ -51,7 +51,8 @@
5151
"symfony/security": "^2.8 || ^3.0 || ^4.0"
5252
},
5353
"conflict": {
54-
"phpunit/phpunit": "<5.4.3"
54+
"phpunit/phpunit": "<5.4.3",
55+
"twig/twig": "<1.34"
5556
},
5657
"suggest": {
5758
"friendsofsymfony/user-bundle": "In order to ease user management",

0 commit comments

Comments
 (0)