feature #32458 Remove support for Twig 1.x (fabpot)

fabpot · fabpot · commit 8172d0ffbb27 · 2019-07-09T13:48:14.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- Remove support for Twig 1.x | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | n/a | License | MIT | Doc PR | n/a  Commits ------- 906b3ca removed support for Twig 1.x
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "~1.0",
         "fig/link-util": "^1.0",
-        "twig/twig": "^1.41|^2.10",
+        "twig/twig": "^2.10",
         "psr/cache": "~1.0",
         "psr/container": "^1.0",
         "psr/link": "^1.0",
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.2.9",
         "symfony/translation-contracts": "^1.1",
-        "twig/twig": "^1.41|^2.10"
+        "twig/twig": "^2.10"
     },
     "require-dev": {
         "egulias/email-validator": "^2.0",
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -60,7 +60,7 @@
         "symfony/web-link": "^4.4|^5.0",
         "doctrine/annotations": "~1.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0",
-        "twig/twig": "~1.34|~2.4"
+        "twig/twig": "^2.4"
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0",
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -44,7 +44,7 @@
         "symfony/yaml": "^4.4|^5.0",
         "symfony/expression-language": "^4.4|^5.0",
         "doctrine/doctrine-bundle": "^1.5|^2.0",
-        "twig/twig": "~1.34|~2.4"
+        "twig/twig": "^2.4"
     },
     "conflict": {
         "symfony/browser-kit": "<4.4",
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -23,7 +23,7 @@
         "symfony/http-foundation": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4|^5.0",
         "symfony/polyfill-ctype": "~1.8",
-        "twig/twig": "~1.41|~2.10"
+        "twig/twig": "^2.10"
     },
     "require-dev": {
         "symfony/asset": "^4.4|^5.0",
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -22,7 +22,7 @@
         "symfony/routing": "^4.4|^5.0",
         "symfony/twig-bundle": "^4.4|^5.0",
         "symfony/var-dumper": "^4.4|^5.0",
-        "twig/twig": "^1.41|^2.10"
+        "twig/twig": "^2.10"
     },
     "require-dev": {
         "symfony/console": "^4.4|^5.0",
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -40,7 +40,7 @@
         "symfony/translation-contracts": "^1.1",
         "symfony/var-dumper": "^4.4|^5.0",
         "psr/cache": "~1.0",
-        "twig/twig": "^1.34|^2.4"
+        "twig/twig": "^2.4"
     },
     "provide": {
         "psr/log-implementation": "1.0"
@@ -51,7 +51,7 @@
         "symfony/dependency-injection": "<4.4",
         "symfony/translation": "<4.4",
         "symfony/var-dumper": "<4.4",
-        "twig/twig": "<1.34|<2.4,>=2"
+        "twig/twig": "<2.4"
     },
     "suggest": {
         "symfony/browser-kit": "",
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
@@ -23,7 +23,7 @@
         "ext-iconv": "*",
         "symfony/console": "^4.4|^5.0",
         "symfony/process": "^4.4|^5.0",
-        "twig/twig": "~1.34|~2.4"
+        "twig/twig": "^2.4"
     },
     "conflict": {
         "phpunit/phpunit": "<5.4.3",
