Explorar el Código

Update the composer constraints for Twig 2 compat

Christophe Coevoet hace 9 años
padre
commit
3d8297af1b
Se han modificado 1 ficheros con 4 adiciones y 1 borrados
  1. 4 1
      composer.json

+ 4 - 1
composer.json

@@ -19,12 +19,15 @@
         "doctrine/annotations": "1.*",
         "doctrine/instantiator": "~1.0.3"
     },
+    "conflict": {
+        "twig/twig": "<1.12"
+    },
     "suggest": {
         "symfony/yaml": "Required if you'd like to serialize data to YAML format."
     },
     "minimum-stability": "dev",
     "require-dev": {
-        "twig/twig": ">=1.8,<2.0-dev",
+        "twig/twig": "~1.12|~2.0",
         "doctrine/orm": "~2.1",
         "doctrine/phpcr-odm": "~1.0.1",
         "jackalope/jackalope-doctrine-dbal": "1.0.*",