fixed merge
This commit is contained in:
parent
d6374ae531
commit
c99f9d29cd
@ -45,4 +45,27 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase
|
|||||||
array('SQL', array('foo' => 'bar'), array('foo' => 'bar'))
|
array('SQL', array('foo' => 'bar'), array('foo' => 'bar'))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testLogNonUtf8()
|
||||||
|
{
|
||||||
|
$logger = $this->getMock('Symfony\\Component\\HttpKernel\\Log\\LoggerInterface');
|
||||||
|
|
||||||
|
$dbalLogger = $this
|
||||||
|
->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
|
||||||
|
->setConstructorArgs(array($logger, null))
|
||||||
|
->setMethods(array('log'))
|
||||||
|
->getMock()
|
||||||
|
;
|
||||||
|
|
||||||
|
$dbalLogger
|
||||||
|
->expects($this->once())
|
||||||
|
->method('log')
|
||||||
|
->with('SQL ({"utf8":"foo","nonutf8":null})')
|
||||||
|
;
|
||||||
|
|
||||||
|
$dbalLogger->startQuery('SQL', array(
|
||||||
|
'utf8' => 'foo',
|
||||||
|
'nonutf8' => "\x7F\xFF"
|
||||||
|
));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,39 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This file is part of the Symfony package.
|
|
||||||
*
|
|
||||||
* (c) Fabien Potencier <fabien@symfony.com>
|
|
||||||
*
|
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Symfony\Tests\Bridge\Doctrine\Logger;
|
|
||||||
|
|
||||||
|
|
||||||
class DbalLoggerTest extends \PHPUnit_Framework_TestCase
|
|
||||||
{
|
|
||||||
public function testLogNonUtf8()
|
|
||||||
{
|
|
||||||
$logger = $this->getMock('Symfony\\Component\\HttpKernel\\Log\\LoggerInterface');
|
|
||||||
|
|
||||||
$dbalLogger = $this
|
|
||||||
->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
|
|
||||||
->setConstructorArgs(array($logger, null))
|
|
||||||
->setMethods(array('log'))
|
|
||||||
->getMock()
|
|
||||||
;
|
|
||||||
|
|
||||||
$dbalLogger
|
|
||||||
->expects($this->once())
|
|
||||||
->method('log')
|
|
||||||
->with('SQL ({"utf8":"foo","nonutf8":null})')
|
|
||||||
;
|
|
||||||
|
|
||||||
$dbalLogger->startQuery('SQL', array(
|
|
||||||
'utf8' => 'foo',
|
|
||||||
'nonutf8' => "\x7F\xFF"
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
Reference in New Issue
Block a user