minor #17364 [Bridge] [Doctrine] Normalize params only when used. [2.3] (SpacePossum)

fabpot · fabpot · commit 9d189137e3ad · 2016-01-15T17:58:40.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Bridge] [Doctrine] Normalize params only when used. [2.3] | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT If no logger is set the params are not used so those don't have to be normalized. Commits ------- 6852a46 Normalize params only when used.
diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -49,12 +49,8 @@ public function startQuery($sql, array $params = null, array $types = null)
             $this->stopwatch->start('doctrine', 'doctrine');
         }
 
-        if (is_array($params)) {
-            $params = $this->normalizeParams($params);
-        }
-
         if (null !== $this->logger) {
-            $this->log($sql, null === $params ? array() : $params);
+            $this->log($sql, null === $params ? array() : $this->normalizeParams($params));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,8 @@ public function startQuery($sql, array $params = null, array $types = null)`
`49`	`49`	`$this->stopwatch->start('doctrine', 'doctrine');`
`50`	`50`	`}`
`51`	`51`
`52`		`- if (is_array($params)) {`
`53`		`- $params = $this->normalizeParams($params);`
`54`		`- }`
`55`		`-`
`56`	`52`	`if (null !== $this->logger) {`
`57`		`- $this->log($sql, null === $params ? array() : $params);`
	`53`	`+ $this->log($sql, null === $params ? array() : $this->normalizeParams($params));`
`58`	`54`	`}`
`59`	`55`	`}`
`60`	`56`