From 81c6df511d6717b85e665b8e37b180f7c40a1bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Sun, 22 Sep 2019 15:02:54 +0200 Subject: [PATCH] Use VarCloner data instead of legacy array for query params --- .../Doctrine/DataCollector/DoctrineDataCollector.php | 2 ++ .../Tests/DataCollector/DoctrineDataCollectorTest.php | 7 +++++-- src/Symfony/Bridge/Doctrine/composer.json | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php index aa1cd95d8d..3e844f0eea 100644 --- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php +++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php @@ -166,6 +166,8 @@ class DoctrineDataCollector extends DataCollector } } + $query['params'] = $this->cloneVar($query['params']); + return $query; } diff --git a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php index b9c9d51b71..e6547f3844 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php @@ -17,6 +17,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\VarDumper\Cloner\Data; class DoctrineDataCollectorTest extends TestCase { @@ -96,9 +97,11 @@ class DoctrineDataCollectorTest extends TestCase $c->collect(new Request(), new Response()); $collectedQueries = $c->getQueries(); - $this->assertEquals([], $collectedQueries['default'][0]['params']); + $this->assertInstanceOf(Data::class, $collectedQueries['default'][0]['params']); + $this->assertEquals([], $collectedQueries['default'][0]['params']->getValue()); $this->assertTrue($collectedQueries['default'][0]['explainable']); - $this->assertEquals([], $collectedQueries['default'][1]['params']); + $this->assertInstanceOf(Data::class, $collectedQueries['default'][1]['params']); + $this->assertEquals([], $collectedQueries['default'][1]['params']->getValue()); $this->assertTrue($collectedQueries['default'][1]['explainable']); } diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index d422cefaf5..0578a4be8e 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -36,6 +36,7 @@ "symfony/security-core": "^4.4|^5.0", "symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/validator": "^3.4.31|^4.3.4|^5.0", + "symfony/var-dumper": "^3.4|^4.0|^5.0", "symfony/translation": "^3.4|^4.0|^5.0", "doctrine/annotations": "~1.7", "doctrine/cache": "~1.6",