From a700a183859a87c21ad57239a3b5262b25a4d315 Mon Sep 17 00:00:00 2001 From: Sarah Khalil Date: Fri, 15 Mar 2013 16:06:50 +0100 Subject: [PATCH 1/2] [DoctrineBridge] Fixed non-utf-8 recognition --- src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php index fd1dde44b9d8d..9f18d60e8a462 100644 --- 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 (false === preg_match('#[^\p{L}\p{N} ]#u', $params[$index])) { $params[$index] = self::BINARY_DATA_VALUE; continue; } From ff6d96353930d09e036acfab3b685ea81d946c2b Mon Sep 17 00:00:00 2001 From: Sarah Khalil Date: Fri, 15 Mar 2013 17:02:23 +0100 Subject: [PATCH 2/2] [DoctrineLogger] Fixed utf-8 recognition regex --- src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php index 9f18d60e8a462..de31b44337ddd 100644 --- 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 (false === 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; }