geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-08-30 12:06:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use faster hash algorithm (xxh128) on PHP 8.1

Browse Source
This commit is contained in:
Jérôme TAMARELLE
2021-11-07 00:31:56 +01:00
committed by Jérôme Tamarelle
parent 2117e4b1bc
commit 4fcc6b1c47
7 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Cache/FilesystemCache.php
+1 -1
View File
@@ -35,7 +35,7 @@ class FilesystemCache implements CacheInterface
public function generateKey($name, $className)
{
$hash = hash('sha256', $className);
$hash = hash(\PHP_VERSION_ID < 80100 ? 'sha256' : 'xxh128', $className);
return $this->directory.$hash[0].$hash[1].'/'.$hash.'.php';
}
src/Environment.php
+2 -2
View File
@@ -298,7 +298,7 @@ class Environment
{
$key = $this->getLoader()->getCacheKey($name).$this->optionsHash;
return $this->templateClassPrefix.hash('sha256', $key).(null === $index ? '' : '___'.$index);
return $this->templateClassPrefix.hash(\PHP_VERSION_ID < 80100 ? 'sha256' : 'xxh128', $key).(null === $index ? '' : '___'.$index);
}
/**
@@ -445,7 +445,7 @@ class Environment
*/
public function createTemplate($template, string $name = null)
{
$hash = hash('sha256', $template, false);
$hash = hash(\PHP_VERSION_ID < 80100 ? 'sha256' : 'xxh128', $template, false);
if (null !== $name) {
$name = sprintf('%s (string template %s)', $name, $hash);
} else {
src/Profiler/NodeVisitor/ProfilerNodeVisitor.php
+1 -1
View File
@@ -33,7 +33,7 @@ final class ProfilerNodeVisitor extends AbstractNodeVisitor
public function __construct(string $extensionName)
{
$this->extensionName = $extensionName;
$this->varName = sprintf('__internal_%s', hash('sha256', $extensionName));
$this->varName = sprintf('__internal_%s', hash(\PHP_VERSION_ID < 80100 ? 'sha256' : 'xxh128', $extensionName));
}
protected function doEnterNode(Node $node, Environment $env)
src/Test/IntegrationTestCase.php
+1 -1
View File
@@ -186,7 +186,7 @@ abstract class IntegrationTestCase extends TestCase
// avoid using the same PHP class name for different cases
$p = new \ReflectionProperty($twig, 'templateClassPrefix');
$p->setAccessible(true);
$p->setValue($twig, '__TwigTemplate_'.hash('sha256', uniqid(mt_rand(), true), false).'_');
$p->setValue($twig, '__TwigTemplate_'.hash(\PHP_VERSION_ID < 80100 ? 'sha256' : 'xxh128', uniqid(mt_rand(), true), false).'_');
$deprecations = [];
try {
tests/Cache/FilesystemTest.php
+1 -1
View File
@@ -23,7 +23,7 @@ class FilesystemTest extends TestCase
protected function setUp(): void
{
$nonce = hash('sha256', uniqid(mt_rand(), true));
$nonce = hash(\PHP_VERSION_ID < 80100 ? 'sha256' : 'xxh128', uniqid(mt_rand(), true));
$this->classname = '__Twig_Tests_Cache_FilesystemTest_Template_'.$nonce;
$this->directory = sys_get_temp_dir().'/twig-test';
$this->cache = new FilesystemCache($this->directory);
tests/Fixtures/functions/template_from_string_error.test
+3 -1
View File
@@ -1,8 +1,10 @@
--TEST--
"template_from_string" function
--CONDITION--
PHP_VERSION_ID >= 80100
--TEMPLATE--
{% include template_from_string("{{ not a Twig template ", "foo.twig") %}
--DATA--
return []
--EXCEPTION--
Twig\Error\SyntaxError: Unclosed "variable" in "foo.twig (string template 4900163d56b1af4b704c6b0afee7f98ba53418ce7a93d37a3af1882735baf9cd)" at line 1.
Twig\Error\SyntaxError: Unclosed "variable" in "foo.twig (string template 85e7b092afbbcd36f11981c2ef8f1569)" at line 1.
tests/Fixtures/functions/template_from_string_error_php80.test
+10
View File
@@ -0,0 +1,10 @@
--TEST--
"template_from_string" function
--CONDITION--
PHP_VERSION_ID < 80100
--TEMPLATE--
{% include template_from_string("{{ not a Twig template ", "foo.twig") %}
--DATA--
return []
--EXCEPTION--
Twig\Error\SyntaxError: Unclosed "variable" in "foo.twig (string template 4900163d56b1af4b704c6b0afee7f98ba53418ce7a93d37a3af1882735baf9cd)" at line 1.