Merge pull request #481 from greg0ire/twig-3

jaapio · web-flow · commit 31c955a9cf8a · 2023-07-07T11:51:34.000+02:00
Use a recent version of Twig
diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
         "symfony/process": "^5.4 || ^6.3",
         "symfony/string": "^5.4 || ^6.3",
         "symfony/translation-contracts": "^2.1 || ^3.0",
-        "twig/twig": "~2.0",
+        "twig/twig": "~2.0 || ^3.0",
         "webmozart/assert": "^1.10"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/packages/guides-graphs/composer.json b/packages/guides-graphs/composer.json
@@ -25,6 +25,6 @@
         "phpdocumentor/guides": "self.version",
         "phpdocumentor/guides-restructured-text": "self.version",
         "symfony/process": "^5.4 || ^6.3",
-        "twig/twig": "~2.0"
+        "twig/twig": "~2.0 || ^3.0"
     }
 }
diff --git a/packages/guides/composer.json b/packages/guides/composer.json
@@ -30,7 +30,7 @@
         "psr/event-dispatcher": "^1.0",
         "symfony/string": "^5.4 || ^6.3",
         "symfony/translation-contracts": "^2.1 || ^3.0",
-        "twig/twig": "~2.15",
+        "twig/twig": "~2.15 || ^3.0",
         "webmozart/assert": "^1.11"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@`
`25`	`25`	`"phpdocumentor/guides": "self.version",`
`26`	`26`	`"phpdocumentor/guides-restructured-text": "self.version",`
`27`	`27`	`"symfony/process": "^5.4 \|\| ^6.3",`
`28`		`- "twig/twig": "~2.0"`
	`28`	`+ "twig/twig": "~2.0 \|\| ^3.0"`
`29`	`29`	`}`
`30`	`30`	`}`