RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 13:31:45 +03:00
Code Issues Projects Releases Wiki Activity

Fix parameter name comparison in QueryBuilder#setParameter() with different types

Browse Source
This commit is contained in:
Luís Cobucci 2017-11-24 02:22:38 +01:00
parent 6cb5a9c50a
commit b8fd708139
No known key found for this signature in database
GPG Key ID: EC61C5F01750ED3C
2 changed files with 86 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Doctrine/ORM/QueryBuilder.php
View File

@ -532,26 +532,15 @@ class QueryBuilder
*/
public function setParameter($key, $value, $type = null)
{
$filteredParameters = $this->parameters->filter(
function ($parameter) use ($key)
{
/* @var Query\Parameter $parameter */
// Must not be identical because of string to integer conversion
return ($key == $parameter->getName());
}
);
$existingParameter = $this->getParameter($key);
if (count($filteredParameters)) {
/* @var Query\Parameter $parameter */
$parameter = $filteredParameters->first();
$parameter->setValue($value, $type);
if ($existingParameter !== null) {
$existingParameter->setValue($value, $type);
return $this;
}
$parameter = new Query\Parameter($key, $value, $type);
$this->parameters->add($parameter);
$this->parameters->add(new Query\Parameter($key, $value, $type));
return $this;
}
@ -614,15 +603,14 @@ class QueryBuilder
public function getParameter($key)
{
$filteredParameters = $this->parameters->filter(
function ($parameter) use ($key)
{
/* @var Query\Parameter $parameter */
// Must not be identical because of string to integer conversion
return ($key == $parameter->getName());
function (Query\Parameter $parameter) use ($key) : bool {
$parameterName = $parameter->getName();
return $key === $parameterName || (string) $key === (string) $parameterName;
}
);
return count($filteredParameters) ? $filteredParameters->first() : null;
return ! $filteredParameters->isEmpty() ? $filteredParameters->first() : null;
}
/**

77
tests/Doctrine/Tests/ORM/QueryBuilderTest.php
View File

@ -1158,4 +1158,81 @@ class QueryBuilderTest extends OrmTestCase
$this->assertEquals(['u', 'g'], $aliases);
}
/**
* @group 6699
*/
public function testGetParameterTypeJuggling() : void
{
$builder = $this->_em->createQueryBuilder()
->select('u')
->from(CmsUser::class, 'u')
->where('u.id = ?0');
$builder->setParameter(0, 0);
self::assertCount(1, $builder->getParameters());
self::assertSame(0, $builder->getParameter(0)->getValue());
self::assertSame(0, $builder->getParameter('0')->getValue());
}
/**
* @group 6699
*/
public function testSetParameterWithNameZeroIsNotOverridden() : void
{
$builder = $this->_em->createQueryBuilder()
->select('u')
->from(CmsUser::class, 'u')
->where('u.id != ?0')
->andWhere('u.username = :name');
$builder->setParameter(0, 0);
$builder->setParameter('name', 'Doctrine');
self::assertCount(2, $builder->getParameters());
self::assertSame(0, $builder->getParameter('0')->getValue());
self::assertSame('Doctrine', $builder->getParameter('name')->getValue());
}
/**
* @group 6699
*/
public function testSetParameterWithNameZeroDoesNotOverrideAnotherParameter() : void
{
$builder = $this->_em->createQueryBuilder()
->select('u')
->from(CmsUser::class, 'u')
->where('u.id != ?0')
->andWhere('u.username = :name');
$builder->setParameter('name', 'Doctrine');
$builder->setParameter(0, 0);
self::assertCount(2, $builder->getParameters());
self::assertSame(0, $builder->getParameter(0)->getValue());
self::assertSame('Doctrine', $builder->getParameter('name')->getValue());
}
/**
* @group 6699
*/
public function testSetParameterWithTypeJugglingWorks() : void
{
$builder = $this->_em->createQueryBuilder()
->select('u')
->from(CmsUser::class, 'u')
->where('u.id != ?0')
->andWhere('u.username = :name');
$builder->setParameter('0', 1);
$builder->setParameter('name', 'Doctrine');
$builder->setParameter(0, 2);
$builder->setParameter('0', 3);
self::assertCount(2, $builder->getParameters());
self::assertSame(3, $builder->getParameter(0)->getValue());
self::assertSame(3, $builder->getParameter('0')->getValue());
self::assertSame('Doctrine', $builder->getParameter('name')->getValue());
}
}