Skip to content

Commit a35070b

Browse files
Findus23sgiehl
andauthored
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 <[email protected]>
1 parent 2851045 commit a35070b

File tree

27 files changed

+235
-153
lines changed

27 files changed

+235
-153
lines changed

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
},
2121
"config":{
2222
"platform": {
23-
"php": "7.2.0"
23+
"php": "7.2.5"
2424
},
2525
"prepend-autoloader": false,
2626
"sort-packages": true
2727
},
2828
"require": {
29-
"php": ">=7.2.0",
29+
"php": ">=7.2.5",
3030
"composer/semver": "~1.3.0",
3131
"davaxi/sparkline": "~1.2",
3232
"geoip2/geoip2": "^2.8",
@@ -37,7 +37,7 @@
3737
"matomo/ini": "~2.0",
3838
"matomo/matomo-php-tracker": "dev-4.x-dev",
3939
"matomo/network": "~2.0",
40-
"matomo/referrer-spam-blacklist": "~3.0",
40+
"matomo/referrer-spam-blacklist": "^3.11",
4141
"matomo/searchengine-and-social-list": "~3.0",
4242
"monolog/monolog": "~1.11",
4343
"mustangostang/spyc": "~0.6.0",
@@ -51,7 +51,7 @@
5151
"symfony/monolog-bridge": "~2.6.0",
5252
"szymach/c-pchart": "^2.0",
5353
"tecnickcom/tcpdf": "~6.0",
54-
"twig/twig": "~1.0"
54+
"twig/twig": "^3.0"
5555
},
5656
"require-dev": {
5757
"lox/xhprof": "dev-master",

composer.lock

+72-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/FrontController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public function dispatch($module = null, $action = null, $parameters = null)
176176
* @param \Piwik\NoAccessException $exception The exception that was caught.
177177
*/
178178
Piwik::postEvent('User.isNotAuthorized', array($exception), $pending = true);
179-
} catch (\Twig_Error_Runtime $e) {
179+
} catch (\Twig\Error\RuntimeError $e) {
180180
echo $this->generateSafeModeOutputFromException($e);
181181
exit;
182182
} catch(StylesheetLessCompileException $e) {

0 commit comments

Comments
 (0)