Commit 9834f3c1 authored by Fabien Potencier's avatar Fabien Potencier

fixed CS

parent d7283586
...@@ -86,7 +86,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface ...@@ -86,7 +86,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface
$app['dbs.options.initializer'](); $app['dbs.options.initializer']();
$configs = new Container(); $configs = new Container();
$addLogger = (null !== $app['logger'] && class_exists('Symfony\Bridge\Doctrine\Logger\DbalLogger')); $addLogger = null !== $app['logger'] && class_exists('Symfony\Bridge\Doctrine\Logger\DbalLogger');
foreach ($app['dbs.options'] as $name => $options) { foreach ($app['dbs.options'] as $name => $options) {
$configs[$name] = new Configuration(); $configs[$name] = new Configuration();
if ($addLogger) { if ($addLogger) {
......
...@@ -85,19 +85,19 @@ class DoctrineServiceProviderTest extends \PHPUnit_Framework_TestCase ...@@ -85,19 +85,19 @@ class DoctrineServiceProviderTest extends \PHPUnit_Framework_TestCase
$this->markTestSkipped('pdo_sqlite is not available'); $this->markTestSkipped('pdo_sqlite is not available');
} }
if (!class_exists('Symfony\Bridge\Doctrine\Logger\DbalLogger')){ if (!class_exists('Symfony\Bridge\Doctrine\Logger\DbalLogger')) {
$this->markTestSkipped('Symfony\Bridge\Doctrine\Logger\DbalLogger is not available'); $this->markTestSkipped('Symfony\Bridge\Doctrine\Logger\DbalLogger is not available');
} }
$app = new Application(); $app = new Application();
$this->assertTrue(isset($app['logger'])); $this->assertTrue(isset($app['logger']));
$this->assertTrue($app['logger'] == null); $this->assertNull($app['logger']);
$app->register(new DoctrineServiceProvider(), array( $app->register(new DoctrineServiceProvider(), array(
'dbs.options' => array( 'dbs.options' => array(
'sqlite1' => array('driver' => 'pdo_sqlite', 'memory' => true) 'sqlite1' => array('driver' => 'pdo_sqlite', 'memory' => true),
) ),
)); ));
$this->assertEquals(22, $app['db']->fetchColumn('SELECT 22')); $this->assertEquals(22, $app['db']->fetchColumn('SELECT 22'));
$this->assertTrue($app['db']->getConfiguration()->getSQLLogger() == null); $this->assertNull($app['db']->getConfiguration()->getSQLLogger());
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment