merged branch saro0h/issue-7297 (PR #7392)

fabpot · fabpot · commit 358689cd3e22 · 2013-03-16T16:50:00.000+01:00
This PR was squashed before being merged into the 2.1 branch (closes #7392). Commits ------- 67fbbac [DoctrineBridge] Fixed non-utf-8 recognition Discussion ---------- [DoctrineBridge] Fixed non-utf-8 recognition | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7297 --------------------------------------------------------------------------- by jfsimon at 2013-03-15T15:10:28Z :+1: --------------------------------------------------------------------------- by francisbesset at 2013-03-15T15:17:17Z :-1: --------------------------------------------------------------------------- by pborreli at 2013-03-15T15:21:10Z travis test is failing https://travis-ci.org/symfony/symfony/jobs/5529163#L225 --------------------------------------------------------------------------- by pborreli at 2013-03-15T15:35:31Z if there is any regression it could help to write a new failing test first. --------------------------------------------------------------------------- by jfsimon at 2013-03-15T15:55:52Z @pborreli the test was already failing --------------------------------------------------------------------------- by pborreli at 2013-03-15T15:58:52Z @jfsimon ah ok, well it still fails 😃 --------------------------------------------------------------------------- by francisbesset at 2013-03-15T16:00:39Z @jfsimon if this is true I gives: 👍 --------------------------------------------------------------------------- by jfsimon at 2013-03-15T16:14:47Z @saro0h \o/ --------------------------------------------------------------------------- by pborreli at 2013-03-15T16:16:54Z :+1:
diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -56,7 +56,7 @@ public function startQuery($sql, array $params = null, array $types = null)
                 }
 
                 // non utf-8 strings break json encoding
-                if (null === preg_match('#[^\p{L}\p{N} ]#u', $params[$index])) {
+                if (!preg_match('#[\p{L}\p{N} ]#u', $params[$index])) {
                     $params[$index] = self::BINARY_DATA_VALUE;
                     continue;
                 }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function startQuery($sql, array $params = null, array $types = null)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`// non utf-8 strings break json encoding`
`59`		`- if (null === preg_match('#[^\p{L}\p{N} ]#u', $params[$index])) {`
	`59`	`+ if (!preg_match('#[\p{L}\p{N} ]#u', $params[$index])) {`
`60`	`60`	`$params[$index] = self::BINARY_DATA_VALUE;`
`61`	`61`	`continue;`
`62`	`62`	`}`