Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Twig 3 upgrade #15573

Merged
merged 25 commits into from
Jun 4, 2020
Merged

Twig 3 upgrade #15573

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
157cf7f
proof of concept of Twig 3 upgrade
Findus23 Feb 14, 2020
ac64515
some for if template fixes
Findus23 Feb 16, 2020
fe60f48
potentially fix RenderTokenParser
Findus23 Feb 16, 2020
24523d9
comment out RenderTokenParser
Findus23 Feb 16, 2020
f608211
clearCompiledTemplates() using unlinkRecursive()
Findus23 Feb 16, 2020
6aa7451
macro imported in block and used in subblock is not valid
Findus23 Feb 16, 2020
877fdb2
more template fixes
Findus23 Feb 16, 2020
486c436
remove non existing clearTemplateCache()
Findus23 Feb 16, 2020
b30ce4d
add missing parameter to unlinkRecursive
Findus23 Feb 16, 2020
b9acd32
Merge branch '4.x-dev' into twig3-wip
sgiehl May 19, 2020
563b0a1
Use custom MethodCallExpression to fix RenderTokenParser
sgiehl May 19, 2020
d3b5bc8
increase minimum php version to 7.2.5
sgiehl May 19, 2020
db073de
submodule update
sgiehl May 19, 2020
2577253
fix twig loop filter
sgiehl May 19, 2020
01ef717
updates expected UI files
sgiehl May 19, 2020
1bce8ac
fix twig loop filter
sgiehl May 19, 2020
725b949
fix twig loop filter
sgiehl May 19, 2020
91232fa
fix neutral evolution check
sgiehl May 19, 2020
b3439fd
fix macro usage
sgiehl May 19, 2020
95ec17e
convert some conditions to filters
sgiehl May 19, 2020
c72a442
fix macro include
sgiehl May 19, 2020
cb52888
Merge branch '4.x-dev' into twig3-wip
sgiehl Jun 3, 2020
ff0d396
remove debug code as default logging is good enough
sgiehl Jun 3, 2020
f15a87c
Merge remote-tracking branch 'origin/4.x-dev' into twig3-wip
sgiehl Jun 4, 2020
bf06990
submodule updates
sgiehl Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
89 changes: 72 additions & 17 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/FrontController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public function dispatch($module = null, $action = null, $parameters = null)
* @param \Piwik\NoAccessException $exception The exception that was caught.
*/
Piwik::postEvent('User.isNotAuthorized', array($exception), $pending = true);
} catch (\Twig_Error_Runtime $e) {
} catch (\Twig\Error\RuntimeError $e) {
echo $this->generateSafeModeOutputFromException($e);
exit;
} catch(StylesheetLessCompileException $e) {
Expand Down
Loading