Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix escaped placeholder and interpolate paramters with non sequential numeric keys #2073

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

Merged
ostrolucky merged 3 commits into from
Oct 4, 2025
Merged

Fix escaped placeholder and interpolate paramters with non sequential numeric keys #2073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff8e18
Fix interpolate paramters with non sequential numeric keys and escape…
FlashBlack Oct 2, 2025
35948b7
use single-line array in tests
FlashBlack Oct 2, 2025
d558e9e
correct use function order
FlashBlack Oct 3, 2025
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
20 changes: 12 additions & 8 deletions src/Twig/DoctrineExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@
use Twig\TwigFilter;

use function addslashes;
use function array_filter;
use function array_key_exists;
use function array_keys;
use function array_merge;
use function array_values;
use function bin2hex;
use function class_exists;
use function count;
use function implode;
use function is_array;
use function is_bool;
Expand Down Expand Up @@ -121,26 +125,26 @@ public function replaceQueryParameters($query, $parameters)
$parameters = $parameters->getValue(true);
}

$i = 0;

if (! array_key_exists(0, $parameters) && array_key_exists(1, $parameters)) {
$i = 1;
$keys = array_keys($parameters);
if (count(array_filter($keys, 'is_int')) === count($keys)) {
$parameters = array_values($parameters);
}

$i = 0;

return preg_replace_callback(
'/\?|((?<!:):[a-z0-9_]+)/i',
'/(?<!\?)\?(?!\?)|(?<!:)(:[a-z0-9_]+)/i',
static function ($matches) use ($parameters, &$i) {
$key = substr($matches[0], 1);

if (! array_key_exists($i, $parameters) && ! array_key_exists($key, $parameters)) {
return $matches[0];
}

$value = array_key_exists($i, $parameters) ? $parameters[$i] : $parameters[$key];
$result = DoctrineExtension::escapeFunction($value);
$value = array_key_exists($i, $parameters) ? $parameters[$i] : $parameters[$key];
$i++;

return $result;
return DoctrineExtension::escapeFunction($value);
},
$query,
);
Expand Down
16 changes: 13 additions & 3 deletions tests/Twig/DoctrineExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public function testReplaceQueryParametersWithPostgresCasting(): void
$this->assertEquals('a=1 OR (1)::string OR b=2', $result);
}

public function testReplaceQueryParametersWithStartingIndexAtOne(): void
public function testReplaceQueryParametersWithNonSequentialNumericKeys(): void
{
$extension = new DoctrineExtension();
$query = 'a=? OR b=?';
$parameters = [
1 => 1,
2 => 2,
2 => 1,
5 => 2,
];

$result = $extension->replaceQueryParameters($query, $parameters);
Expand Down Expand Up @@ -74,6 +74,16 @@ public function testReplaceQueryParametersWithEmptyArray(): void
$this->assertEquals('IN (NULL)', $result);
}

public function testReplaceQueryParametersWithEscapedParameterPlaceholder(): void
{
$extension = new DoctrineExtension();
$query = 'column->>field ?? ?';
$parameters = ['foo'];

$result = $extension->replaceQueryParameters($query, $parameters);
$this->assertEquals("column->>field ?? 'foo'", $result);
}

public function testEscapeBinaryParameter(): void
{
$binaryString = pack('H*', '9d40b8c1417f42d099af4782ec4b20b6');
Expand Down
Loading