diff --git a/prefixer/composer.json b/prefixer/composer.json index 031fb2ac7c..e7efe7c474 100644 --- a/prefixer/composer.json +++ b/prefixer/composer.json @@ -13,7 +13,7 @@ "symfony/polyfill-mbstring": "^1.11", "symfony/polyfill-php72": "^1.11", "symfony/validator": "3.4.32", - "twig/twig": "1.38.4" + "twig/twig": "1.42.4" }, "scripts": { "post-update-cmd": "@process", diff --git a/prefixer/composer.lock b/prefixer/composer.lock index 5ef8e66f5c..bae34ad71f 100644 --- a/prefixer/composer.lock +++ b/prefixer/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": "3b332f4579bbf0071e8f579853b463de", + "content-hash": "bc733a05ecc8170793ac8a6e1781cb80", "packages": [ { "name": "cerdic/css-tidy", @@ -1560,31 +1560,31 @@ }, { "name": "twig/twig", - "version": "v1.38.4", + "version": "v1.42.4", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "7732e9e7017d751313811bd118de61302e9c8b35" + "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/7732e9e7017d751313811bd118de61302e9c8b35", - "reference": "7732e9e7017d751313811bd118de61302e9c8b35", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152", + "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152", "shasum": "" }, "require": { - "php": ">=5.4.0", + "php": ">=5.5.0", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "^2.7", - "symfony/phpunit-bridge": "^3.4.19|^4.1.8" + "symfony/debug": "^3.4|^4.2", + "symfony/phpunit-bridge": "^4.4@dev|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.38-dev" + "dev-master": "1.42-dev" } }, "autoload": { @@ -1606,15 +1606,15 @@ "homepage": "http://fabien.potencier.org", "role": "Lead Developer" }, - { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com", - "role": "Project Founder" - }, { "name": "Twig Team", "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", @@ -1622,7 +1622,7 @@ "keywords": [ "templating" ], - "time": "2019-03-23T14:27:19+00:00" + "time": "2019-11-11T16:49:32+00:00" } ], "packages-dev": [], diff --git a/prefixer/fix-twig.php b/prefixer/fix-twig.php index 327d6076d4..0627ef8897 100755 --- a/prefixer/fix-twig.php +++ b/prefixer/fix-twig.php @@ -77,8 +77,11 @@ $replacements = [ '\'twig_join_filter\'', '\'twig_split_filter\'', '\'twig_sort_filter\'', - '\'twig_sort_filter\'', + '\'twig_array_merge\'', '\'twig_array_batch\'', + '\'twig_array_filter\'', + '\'twig_array_map\'', + '\'twig_array_reduce\'', '\'twig_reverse_filter\'', '\'twig_length_filter\'', '\'twig_slice\'', @@ -120,6 +123,9 @@ $replacements = [ '\'\\\\MailPoetVendor\\\\twig_sort_filter\'', '\'\\\\MailPoetVendor\\\\twig_array_merge\'', '\'\\\\MailPoetVendor\\\\twig_array_batch\'', + '\'\\\\MailPoetVendor\\\\twig_array_filter\'', + '\'\\\\MailPoetVendor\\\\twig_array_map\'', + '\'\\\\MailPoetVendor\\\\twig_array_reduce\'', '\'\\\\MailPoetVendor\\\\twig_reverse_filter\'', '\'\\\\MailPoetVendor\\\\twig_length_filter\'', '\'\\\\MailPoetVendor\\\\twig_slice\'',