Skip to content

Commit e53bfed

Browse files
committed
bugfix #156 Explicitly require "twig/twig" since it is used by the Twig ticket extensions (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 | This partially reverts #146. Commits ------- 094706c Explicitly require "twig/twig" since it is used by the Twig ticket extensions
2 parents 85754a5 + 094706c commit e53bfed

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
"symfony/translation": "^2.8 || ^3.0 || ^4.0",
4343
"symfony/twig-bundle": "^2.8 || ^3.0 || ^4.0",
4444
"symfony/validator": "^2.8 || ^3.0 || ^4.0",
45-
"symfony/yaml": "^2.8 || ^3.0 || ^4.0"
45+
"symfony/yaml": "^2.8 || ^3.0 || ^4.0",
46+
"twig/twig": "^1.34 || ^2.0"
4647
},
4748
"require-dev": {
4849
"ext-pdo_sqlite": "*",
@@ -51,9 +52,6 @@
5152
"symfony/phpunit-bridge": "^3.2 || ^4.0",
5253
"symfony/security": "^2.8 || ^3.0 || ^4.0"
5354
},
54-
"conflict": {
55-
"twig/twig": "<1.34"
56-
},
5755
"suggest": {
5856
"friendsofsymfony/user-bundle": "In order to ease user management",
5957
"vich/uploader-bundle": "Allow attaching files to ticket messages"

0 commit comments

Comments
 (0)