diff options
| author | Lukas Winkler <git@lw1.at> | 2020-06-04 14:47:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-04 14:47:54 +0300 |
| commit | a35070be5146539999fdd02d5323f466d314192b (patch) | |
| tree | a7f280e0f371f5b5370547b67ae63d142e341126 /composer.json | |
| parent | 2851045e2ffd0f71fa1a56b2b6cab35cc7b1b4ab (diff) | |
Twig 3 upgrade (#15573)
* proof of concept of Twig 3 upgrade
* some for if template fixes
* potentially fix RenderTokenParser
* comment out RenderTokenParser
* clearCompiledTemplates() using unlinkRecursive()
* macro imported in block and used in subblock is not valid
twigphp/Twig#3090
* more template fixes
* remove non existing clearTemplateCache()
* add missing parameter to unlinkRecursive
* Use custom MethodCallExpression to fix RenderTokenParser
* increase minimum php version to 7.2.5
* submodule update
* fix twig loop filter
* updates expected UI files
* fix twig loop filter
* fix twig loop filter
* fix neutral evolution check
* fix macro usage
* convert some conditions to filters
* fix macro include
* remove debug code as default logging is good enough
* submodule updates
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/composer.json b/composer.json index b66bec9c80..cec2176dfc 100644 --- a/composer.json +++ b/composer.json @@ -20,13 +20,13 @@ }, "config":{ "platform": { - "php": "7.2.0" + "php": "7.2.5" }, "prepend-autoloader": false, "sort-packages": true }, "require": { - "php": ">=7.2.0", + "php": ">=7.2.5", "composer/semver": "~1.3.0", "davaxi/sparkline": "~1.2", "geoip2/geoip2": "^2.8", @@ -37,7 +37,7 @@ "matomo/ini": "~2.0", "matomo/matomo-php-tracker": "dev-4.x-dev", "matomo/network": "~2.0", - "matomo/referrer-spam-blacklist": "~3.0", + "matomo/referrer-spam-blacklist": "^3.11", "matomo/searchengine-and-social-list": "~3.0", "monolog/monolog": "~1.11", "mustangostang/spyc": "~0.6.0", @@ -51,7 +51,7 @@ "symfony/monolog-bridge": "~2.6.0", "szymach/c-pchart": "^2.0", "tecnickcom/tcpdf": "~6.0", - "twig/twig": "~1.0" + "twig/twig": "^3.0" }, "require-dev": { "lox/xhprof": "dev-master", |