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 /tests | |
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 'tests')
-rw-r--r-- | tests/PHPUnit/Integration/ReleaseCheckListTest.php | 2 | ||||
-rw-r--r-- | tests/resources/trigger-fatal-exception.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php index 74e4886450..730eac8967 100644 --- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php @@ -27,7 +27,7 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase { private $globalConfig; - const MINIMUM_PHP_VERSION = '7.2.0'; + const MINIMUM_PHP_VERSION = '7.2.5'; public function setUp(): void { diff --git a/tests/resources/trigger-fatal-exception.php b/tests/resources/trigger-fatal-exception.php index ba802fb11d..93f90e6f71 100644 --- a/tests/resources/trigger-fatal-exception.php +++ b/tests/resources/trigger-fatal-exception.php @@ -20,7 +20,7 @@ $executed = false; \Piwik\Piwik::addAction('Request.dispatch', function () use (&$executed) { if (!$executed) { $executed = true; - throw new Twig_Error_Runtime('test message'); + throw new \Twig\Error\RuntimeError('test message'); } }); |