8000 fixed merge · sun/symfony@c99f9d2 · GitHub
[go: up one dir, main page]

Skip to content

Commit c99f9d2

Browse files
committed
fixed merge
1 parent d6374ae commit c99f9d2

File tree

2 files changed

+23
-39
lines changed

2 files changed

+23
-39
lines changed

src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,27 @@ public function getLogFixtures()
4545
array('SQL', array('foo' => 'bar'), array('foo' => 'bar'))
4646
);
4747
}
48+
49+
public function testLogNonUtf8()
50+
{
51+
$logger = $this->getMock('Symfony\\Component\\HttpKernel\\Log\\LoggerInterface');
52+
53+
$dbalLogger = $this
54+
->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
55+
->setConstructorArgs(array($logger, null))
56+
->setMethods(array('log'))
57+
->getMock()
58+
;
59+
60+
$dbalLogger
61+
->expects($this->once())
62+
->method('log')
63+
->with('SQL ({"utf8":"foo","nonutf8":null})')
64+
;
65+
66+
$dbalLogger->startQuery('SQL', array(
67+
'utf8' => 'foo',
68+
'nonutf8' => "\x7F\xFF"
69+
));
70+
}
4871
}

tests/Symfony/Tests/Bridge/Doctrine/Logger/DbalLoggerTest.php

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0