From 52146c7fb9216a99fe4e878783206dc0433ac24d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Fri, 7 Jul 2023 09:21:15 +0200 Subject: [PATCH] Use a recent version of Twig --- composer.json | 2 +- composer.lock | 113 ++++----------------------- packages/guides-graphs/composer.json | 2 +- packages/guides/composer.json | 2 +- 4 files changed, 17 insertions(+), 102 deletions(-) diff --git a/composer.json b/composer.json index 3627e6060..e36d61bbc 100644 --- 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 index 52c150ca0..339887e2d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "947cde1a561b182e7d2861896ff7bd66", + "content-hash": "2b6941c524817e5a71312cb3bb9b649d", "packages": [ { "name": "dflydev/dot-access-data", @@ -1029,7 +1029,7 @@ "dist": { "type": "path", "url": "./packages/guides", - "reference": "b425cd949c20b6b5a0dac1a0f6fae2663d3f36e2" + "reference": "860c07b5071ab58d3bdabbb660067028fdf7d295" }, "require": { "ext-json": "*", @@ -1041,7 +1041,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": { @@ -1123,14 +1123,14 @@ "dist": { "type": "path", "url": "./packages/guides-graphs", - "reference": "339ff4b3ced917e745e0b9076be4db93132d234e" + "reference": "e0346f5ecc58ad13431c0dbd2aa1855ba436dfa2" }, "require": { "php": "^8.1", "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" }, "type": "library", "autoload": { @@ -2378,82 +2378,6 @@ ], "time": "2022-11-03T14:55:06+00:00" }, - { - "name": "symfony/polyfill-php72", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, { "name": "symfony/polyfill-php80", "version": "v1.27.0", @@ -2760,38 +2684,29 @@ }, { "name": "twig/twig", - "version": "v2.15.5", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e" + "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/fc02a6af3eeb97c4bf5650debc76c2eda85ac22e", - "reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd", + "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.8" + "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { - "psr/container": "^1.0", + "psr/container": "^1.0|^2.0", "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.15-dev" - } - }, "autoload": { - "psr-0": { - "Twig_": "lib/" - }, "psr-4": { "Twig\\": "src/" } @@ -2824,7 +2739,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.15.5" + "source": "https://github.com/twigphp/Twig/tree/v3.6.1" }, "funding": [ { @@ -2836,7 +2751,7 @@ "type": "tidelift" } ], - "time": "2023-05-03T17:49:41+00:00" + "time": "2023-06-08T12:52:13+00:00" }, { "name": "webmozart/assert", diff --git a/packages/guides-graphs/composer.json b/packages/guides-graphs/composer.json index 18962aed2..ba08135ba 100644 --- 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 index 7382d5bfd..6c3118f22 100644 --- 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": {