geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 03:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated features

Browse Source
This commit is contained in:
Fabien Potencier
2024-09-21 09:19:32 +02:00
parent 4074410313
commit 70d9cec591
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Util/CallableArgumentsExtractor.php
+1 -7
View File
@@ -132,13 +132,7 @@ final class CallableArgumentsExtractor
if (\is_int($key)) {
$arbitraryArguments->addElement($value);
} else {
$originalKey = $extractedArgumentNameMap[$key];
if ($originalKey !== $this->toSnakeCase($originalKey)) {
trigger_deprecation('twig/twig', '3.15', \sprintf('Using "snake_case" for variadic arguments is required for a smooth upgrade with Twig 4.0; rename "%s" to "%s" in "%s" at line %d.', $originalKey, $this->toSnakeCase($originalKey), $this->node->getSourceContext()->getName(), $this->node->getTemplateLine()));
}
$arbitraryArguments->addElement($value, new ConstantExpression($this->toSnakeCase($originalKey), $this->node->getTemplateLine()));
// I Twig 4.0, don't convert the key:
// $arbitraryArguments->addElement($value, new ConstantExpression($originalKey, $this->node->getTemplateLine()));
$arbitraryArguments->addElement($value, new ConstantExpression($extractedArgumentNameMap[$key], $this->node->getTemplateLine()));
}
unset($extractedArguments[$key]);
}
tests/Util/CallableArgumentsExtractorTest.php
+1 -9
View File
@@ -12,7 +12,6 @@ namespace Twig\Tests\Util;
*/
use PHPUnit\Framework\TestCase;
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
use Twig\Error\SyntaxError;
use Twig\Node\Expression\ConstantExpression;
use Twig\Node\Expression\FunctionExpression;
@@ -24,8 +23,6 @@ use Twig\Util\CallableArgumentsExtractor;
class CallableArgumentsExtractorTest extends TestCase
{
use ExpectDeprecationTrait;
public function testGetArguments()
{
$this->assertEquals(['U', null], $this->getArguments('date', 'date', ['format' => 'U', 'timestamp' => null]));
@@ -108,19 +105,14 @@ class CallableArgumentsExtractorTest extends TestCase
yield ['aBC', 'a_b_c'];
}
/**
* @group legacy
*/
public function testGetArgumentsConversionForVariadics()
{
$this->expectDeprecation('Since twig/twig 3.15: Using "snake_case" for variadic arguments is required for a smooth upgrade with Twig 4.0; rename "someNumberVariadic" to "some_number_variadic" in "test.twig" at line 2.');
$this->assertEquals([
new ConstantExpression('a', 0),
new ConstantExpression(12, 0),
new VariadicExpression([
new ConstantExpression('some_text_variadic', 2), new ConstantExpression('a', 0),
new ConstantExpression('some_number_variadic', 2), new ConstantExpression(12, 0),
new ConstantExpression('someNumberVariadic', 2), new ConstantExpression(12, 0),
], 2),
], $this->getArguments('custom', eval("return fn (string \$someText, int \$some_number, ...\$args) => '';"), ['some_text' => 'a', 'someNumber' => 12, 'some_text_variadic' => 'a', 'someNumberVariadic' => 12], true));
}