diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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

👍

---------------------------------------------------------------------------

by francisbesset at 2013-03-15T15:17:17Z

👎

---------------------------------------------------------------------------

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

👍
This commit is contained in:
Fabien Potencier 2013-03-16 16:50:00 +01:00
commit 358689cd3e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
View File

@ -56,7 +56,7 @@ class DbalLogger implements SQLLogger
}
// 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;
}