Skip to content

D
doctrine-dbal
Unverified Commit be4253f5 authored by Sergei Morozov's avatar Sergei Morozov
Browse files
Options

More code style fixes

parent 41906695
Hide whitespace changes
Inline Side-by-side
Showing with 371 additions and 183 deletions
lib/Doctrine/DBAL/Cache/ArrayStatement.php
View file @ be4253f5
...@@ -123,7 +123,7 @@ class ArrayStatement implements \IteratorAggregate, ResultStatement ...@@ -123,7 +123,7 @@ class ArrayStatement implements \IteratorAggregate, ResultStatement
return reset($row); return reset($row);
} }
throw new \InvalidArgumentException("Invalid fetch-style given for fetching result."); throw new \InvalidArgumentException('Invalid fetch-style given for fetching result.');
} }
/** /**
......
lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
View file @ be4253f5
...@@ -96,7 +96,7 @@ class SQLSrvStatement implements IteratorAggregate, Statement ...@@ -96,7 +96,7 @@ class SQLSrvStatement implements IteratorAggregate, Statement
/** /**
* The fetch style. * The fetch style.
* *
* @param int * @var int
*/ */
private $defaultFetchMode = FetchMode::MIXED; private $defaultFetchMode = FetchMode::MIXED;
......
tests/Doctrine/Tests/DBAL/ConnectionTest.php
View file @ be4253f5
...@@ -495,9 +495,9 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase ...@@ -495,9 +495,9 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase
public function testFetchAssoc() public function testFetchAssoc()
{ {
$statement = 'SELECT * FROM foo WHERE bar = ?'; $statement = 'SELECT * FROM foo WHERE bar = ?';
$params = array(666); $params = [666];
$types = array(ParameterType::INTEGER); $types = [ParameterType::INTEGER];
$result = array(); $result = [];
$driverMock = $this->createMock('Doctrine\DBAL\Driver'); $driverMock = $this->createMock('Doctrine\DBAL\Driver');
...@@ -531,9 +531,9 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase ...@@ -531,9 +531,9 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase
public function testFetchArray() public function testFetchArray()
{ {
$statement = 'SELECT * FROM foo WHERE bar = ?'; $statement = 'SELECT * FROM foo WHERE bar = ?';
$params = array(666); $params = [666];
$types = array(ParameterType::INTEGER); $types = [ParameterType::INTEGER];
$result = array(); $result = [];
$driverMock = $this->createMock('Doctrine\DBAL\Driver'); $driverMock = $this->createMock('Doctrine\DBAL\Driver');
...@@ -567,10 +567,10 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase ...@@ -567,10 +567,10 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase
public function testFetchColumn() public function testFetchColumn()
{ {
$statement = 'SELECT * FROM foo WHERE bar = ?'; $statement = 'SELECT * FROM foo WHERE bar = ?';
$params = array(666); $params = [666];
$types = array(ParameterType::INTEGER); $types = [ParameterType::INTEGER];
$column = 0; $column = 0;
$result = array(); $result = [];
$driverMock = $this->createMock('Doctrine\DBAL\Driver'); $driverMock = $this->createMock('Doctrine\DBAL\Driver');
...@@ -627,9 +627,9 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase ...@@ -627,9 +627,9 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase
public function testFetchAll() public function testFetchAll()
{ {
$statement = 'SELECT * FROM foo WHERE bar = ?'; $statement = 'SELECT * FROM foo WHERE bar = ?';
$params = array(666); $params = [666];
$types = array(ParameterType::INTEGER); $types = [ParameterType::INTEGER];
$result = array(); $result = [];
$driverMock = $this->createMock('Doctrine\DBAL\Driver'); $driverMock = $this->createMock('Doctrine\DBAL\Driver');
......
tests/Doctrine/Tests/DBAL/DriverManagerTest.php
View file @ be4253f5
...@@ -3,8 +3,18 @@ ...@@ -3,8 +3,18 @@
namespace Doctrine\Tests\DBAL; namespace Doctrine\Tests\DBAL;
use Doctrine\DBAL\DBALException; use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver\DrizzlePDOMySql\Driver as DrizzlePDOMySqlDriver;
use Doctrine\DBAL\Driver\PDOMySQL\Driver as PDOMySQLDriver;
use Doctrine\DBAL\Driver\PDOSqlite\Driver as PDOSqliteDriver;
use Doctrine\DBAL\Driver\SQLSrv\Driver as SQLSrvDriver;
use Doctrine\DBAL\DriverManager;
use Doctrine\Tests\DBAL\Mocks\MockPlatform;
use Doctrine\Tests\DbalTestCase;
use Doctrine\Tests\Mocks\ConnectionMock;
use Doctrine\Tests\Mocks\DriverMock;
use stdClass;
class DriverManagerTest extends \Doctrine\Tests\DbalTestCase class DriverManagerTest extends DbalTestCase
{ {
/** /**
* @requires extension pdo_sqlite * @requires extension pdo_sqlite
...@@ -12,10 +22,7 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -12,10 +22,7 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
*/ */
public function testInvalidPdoInstance() public function testInvalidPdoInstance()
{ {
$options = array( DriverManager::getConnection(['pdo' => 'test']);
'pdo' => 'test'
);
$test = \Doctrine\DBAL\DriverManager::getConnection($options);
} }
/** /**
...@@ -23,10 +30,10 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -23,10 +30,10 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
*/ */
public function testValidPdoInstance() public function testValidPdoInstance()
{ {
$options = array( $conn = DriverManager::getConnection([
'pdo' => new \PDO('sqlite::memory:') 'pdo' => new \PDO('sqlite::memory:'),
); ]);
$conn = \Doctrine\DBAL\DriverManager::getConnection($options);
self::assertEquals('sqlite', $conn->getDatabasePlatform()->getName()); self::assertEquals('sqlite', $conn->getDatabasePlatform()->getName());
} }
...@@ -38,11 +45,9 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -38,11 +45,9 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
{ {
$pdo = new \PDO('sqlite::memory:'); $pdo = new \PDO('sqlite::memory:');
$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT); $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT);
$options = array( $options = ['pdo' => $pdo];
'pdo' => $pdo
);
$conn = \Doctrine\DBAL\DriverManager::getConnection($options); DriverManager::getConnection($options);
self::assertEquals(\PDO::ERRMODE_EXCEPTION, $pdo->getAttribute(\PDO::ATTR_ERRMODE)); self::assertEquals(\PDO::ERRMODE_EXCEPTION, $pdo->getAttribute(\PDO::ATTR_ERRMODE));
} }
...@@ -51,7 +56,7 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -51,7 +56,7 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
*/ */
public function testCheckParams() public function testCheckParams()
{ {
$conn = \Doctrine\DBAL\DriverManager::getConnection(array()); DriverManager::getConnection([]);
} }
/** /**
...@@ -59,7 +64,7 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -59,7 +64,7 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
*/ */
public function testInvalidDriver() public function testInvalidDriver()
{ {
$conn = \Doctrine\DBAL\DriverManager::getConnection(array('driver' => 'invalid_driver')); DriverManager::getConnection(['driver' => 'invalid_driver']);
} }
/** /**
...@@ -67,13 +72,13 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -67,13 +72,13 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
*/ */
public function testCustomPlatform() public function testCustomPlatform()
{ {
$mockPlatform = new \Doctrine\Tests\DBAL\Mocks\MockPlatform(); $mockPlatform = new MockPlatform();
$options = array( $options = [
'pdo' => new \PDO('sqlite::memory:'), 'pdo' => new \PDO('sqlite::memory:'),
'platform' => $mockPlatform 'platform' => $mockPlatform,
); ];
$conn = \Doctrine\DBAL\DriverManager::getConnection($options); $conn = DriverManager::getConnection($options);
self::assertSame($mockPlatform, $conn->getDatabasePlatform()); self::assertSame($mockPlatform, $conn->getDatabasePlatform());
} }
...@@ -82,14 +87,14 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -82,14 +87,14 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
*/ */
public function testCustomWrapper() public function testCustomWrapper()
{ {
$wrapperClass = 'Doctrine\Tests\Mocks\ConnectionMock'; $wrapperClass = ConnectionMock::class;
$options = array( $options = [
'pdo' => new \PDO('sqlite::memory:'), 'pdo' => new \PDO('sqlite::memory:'),
'wrapperClass' => $wrapperClass, 'wrapperClass' => $wrapperClass,
); ];
$conn = \Doctrine\DBAL\DriverManager::getConnection($options); $conn = DriverManager::getConnection($options);
self::assertInstanceOf($wrapperClass, $conn); self::assertInstanceOf($wrapperClass, $conn);
} }
...@@ -100,33 +105,29 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -100,33 +105,29 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
{ {
$this->expectException(DBALException::class); $this->expectException(DBALException::class);
$options = array( $options = [
'pdo' => new \PDO('sqlite::memory:'), 'pdo' => new \PDO('sqlite::memory:'),
'wrapperClass' => 'stdClass', 'wrapperClass' => stdClass::class,
); ];
$conn = \Doctrine\DBAL\DriverManager::getConnection($options); DriverManager::getConnection($options);
} }
public function testInvalidDriverClass() public function testInvalidDriverClass()
{ {
$this->expectException(DBALException::class); $this->expectException(DBALException::class);
$options = array( $options = ['driverClass' => stdClass::class];
'driverClass' => 'stdClass'
);
$conn = \Doctrine\DBAL\DriverManager::getConnection($options); DriverManager::getConnection($options);
} }
public function testValidDriverClass() public function testValidDriverClass()
{ {
$options = array( $options = ['driverClass' => PDOMySQLDriver::class];
'driverClass' => 'Doctrine\DBAL\Driver\PDOMySql\Driver',
);
$conn = \Doctrine\DBAL\DriverManager::getConnection($options); $conn = DriverManager::getConnection($options);
self::assertInstanceOf('Doctrine\DBAL\Driver\PDOMySql\Driver', $conn->getDriver()); self::assertInstanceOf(PDOMySQLDriver::class, $conn->getDriver());
} }
/** /**
...@@ -134,9 +135,7 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -134,9 +135,7 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
*/ */
public function testDatabaseUrl($url, $expected) public function testDatabaseUrl($url, $expected)
{ {
$options = is_array($url) ? $url : array( $options = is_array($url) ? $url : ['url' => $url];
'url' => $url,
);
if (isset($options['pdo'])) { if (isset($options['pdo'])) {
if (! extension_loaded('pdo')) { if (! extension_loaded('pdo')) {
...@@ -146,19 +145,17 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -146,19 +145,17 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
$options['pdo'] = $this->createMock(\PDO::class); $options['pdo'] = $this->createMock(\PDO::class);
} }
$options = is_array($url) ? $url : array( $options = is_array($url) ? $url : ['url' => $url];
'url' => $url,
);
if ($expected === false) { if ($expected === false) {
$this->expectException(DBALException::class); $this->expectException(DBALException::class);
} }
$conn = \Doctrine\DBAL\DriverManager::getConnection($options); $conn = DriverManager::getConnection($options);
$params = $conn->getParams(); $params = $conn->getParams();
foreach ($expected as $key => $value) { foreach ($expected as $key => $value) {
if (in_array($key, array('pdo', 'driver', 'driverClass'), true)) { if (in_array($key, ['pdo', 'driver', 'driverClass'], true)) {
self::assertInstanceOf($value, $conn->getDriver()); self::assertInstanceOf($value, $conn->getDriver());
} else { } else {
self::assertEquals($value, $params[$key]); self::assertEquals($value, $params[$key]);
...@@ -168,121 +165,294 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase ...@@ -168,121 +165,294 @@ class DriverManagerTest extends \Doctrine\Tests\DbalTestCase
public function databaseUrls() public function databaseUrls()
{ {
return array( return [
'simple URL' => array( 'simple URL' => [
'mysql://foo:bar@localhost/baz', 'mysql://foo:bar@localhost/baz',
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), [
), 'user' => 'foo',
'simple URL with port' => array( 'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
'simple URL with port' => [
'mysql://foo:bar@localhost:11211/baz', 'mysql://foo:bar@localhost:11211/baz',
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'port' => 11211, 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), [
), 'user' => 'foo',
'sqlite relative URL with host' => array( 'password' => 'bar',
'host' => 'localhost',
'port' => 11211,
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
'sqlite relative URL with host' => [
'sqlite://localhost/foo/dbname.sqlite', 'sqlite://localhost/foo/dbname.sqlite',
array('path' => 'foo/dbname.sqlite', 'driver' => 'Doctrine\DBAL\Driver\PDOSqlite\Driver'), [
), 'path' => 'foo/dbname.sqlite',
'sqlite absolute URL with host' => array( 'driver' => PDOSqliteDriver::class,
],
],
'sqlite absolute URL with host' => [
'sqlite://localhost//tmp/dbname.sqlite', 'sqlite://localhost//tmp/dbname.sqlite',
array('path' => '/tmp/dbname.sqlite', 'driver' => 'Doctrine\DBAL\Driver\PDOSqlite\Driver'), [
), 'path' => '/tmp/dbname.sqlite',
'sqlite relative URL without host' => array( 'driver' => PDOSqliteDriver::class,
],
],
'sqlite relative URL without host' => [
'sqlite:///foo/dbname.sqlite', 'sqlite:///foo/dbname.sqlite',
array('path' => 'foo/dbname.sqlite', 'driver' => 'Doctrine\DBAL\Driver\PDOSqlite\Driver'), [
), 'path' => 'foo/dbname.sqlite',
'sqlite absolute URL without host' => array( 'driver' => PDOSqliteDriver::class,
],
],
'sqlite absolute URL without host' => [
'sqlite:////tmp/dbname.sqlite', 'sqlite:////tmp/dbname.sqlite',
array('path' => '/tmp/dbname.sqlite', 'driver' => 'Doctrine\DBAL\Driver\PDOSqlite\Driver'), [
), 'path' => '/tmp/dbname.sqlite',
'sqlite memory' => array( 'driver' => PDOSqliteDriver::class,
],
],
'sqlite memory' => [
'sqlite:///:memory:', 'sqlite:///:memory:',
array('memory' => true, 'driver' => 'Doctrine\DBAL\Driver\PDOSqlite\Driver'), [
), 'memory' => true,
'sqlite memory with host' => array( 'driver' => PDOSqliteDriver::class,
],
],
'sqlite memory with host' => [
'sqlite://localhost/:memory:', 'sqlite://localhost/:memory:',
array('memory' => true, 'driver' => 'Doctrine\DBAL\Driver\PDOSqlite\Driver'), [
), 'memory' => true,
'params parsed from URL override individual params' => array( 'driver' => PDOSqliteDriver::class,
array('url' => 'mysql://foo:bar@localhost/baz', 'password' => 'lulz'), ],
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), ],
), 'params parsed from URL override individual params' => [
'params not parsed from URL but individual params are preserved' => array( [
array('url' => 'mysql://foo:bar@localhost/baz', 'port' => 1234), 'url' => 'mysql://foo:bar@localhost/baz',
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'port' => 1234, 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), 'password' => 'lulz',
), ],
'query params from URL are used as extra params' => array( [
'user' => 'foo',
'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
'params not parsed from URL but individual params are preserved' => [
[
'url' => 'mysql://foo:bar@localhost/baz',
'port' => 1234,
],
[
'user' => 'foo',
'password' => 'bar',
'host' => 'localhost',
'port' => 1234,
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
'query params from URL are used as extra params' => [
'url' => 'mysql://foo:bar@localhost/dbname?charset=UTF-8', 'url' => 'mysql://foo:bar@localhost/dbname?charset=UTF-8',
array('charset' => 'UTF-8'), ['charset' => 'UTF-8'],
), ],
'simple URL with fallthrough scheme not defined in map' => array( 'simple URL with fallthrough scheme not defined in map' => [
'sqlsrv://foo:bar@localhost/baz', 'sqlsrv://foo:bar@localhost/baz',
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\SQLSrv\Driver'), [
), 'user' => 'foo',
'simple URL with fallthrough scheme containing underscores fails' => array( 'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => SQLSrvDriver::class,
],
],
'simple URL with fallthrough scheme containing underscores fails' => [
'drizzle_pdo_mysql://foo:bar@localhost/baz', 'drizzle_pdo_mysql://foo:bar@localhost/baz',
false, false,
), ],
'simple URL with fallthrough scheme containing dashes works' => array( 'simple URL with fallthrough scheme containing dashes works' => [
'drizzle-pdo-mysql://foo:bar@localhost/baz', 'drizzle-pdo-mysql://foo:bar@localhost/baz',
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\DrizzlePDOMySql\Driver'), [
), 'user' => 'foo',
'simple URL with percent encoding' => array( 'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => DrizzlePDOMySqlDriver::class,
],
],
'simple URL with percent encoding' => [
'mysql://foo%3A:bar%2F@localhost/baz+baz%40', 'mysql://foo%3A:bar%2F@localhost/baz+baz%40',
array('user' => 'foo:', 'password' => 'bar/', 'host' => 'localhost', 'dbname' => 'baz+baz@', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), [
), 'user' => 'foo:',
'simple URL with percent sign in password' => array( 'password' => 'bar/',
'host' => 'localhost',
'dbname' => 'baz+baz@',
'driver' => PDOMySQLDriver::class,
],
],
'simple URL with percent sign in password' => [
'mysql://foo:bar%25bar@localhost/baz', 'mysql://foo:bar%25bar@localhost/baz',
array('user' => 'foo', 'password' => 'bar%bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), [
), 'user' => 'foo',
'password' => 'bar%bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
// DBAL-1234 // DBAL-1234
'URL without scheme and without any driver information' => array( 'URL without scheme and without any driver information' => [
array('url' => '//foo:bar@localhost/baz'), ['url' => '//foo:bar@localhost/baz'],
false, false,
), ],
'URL without scheme but default PDO driver' => array( 'URL without scheme but default PDO driver' => [
array('url' => '//foo:bar@localhost/baz', 'pdo' => true), [
'url' => '//foo:bar@localhost/baz',
'pdo' => true,
],
false, false,
), ],
'URL without scheme but default driver' => array( 'URL without scheme but default driver' => [
array('url' => '//foo:bar@localhost/baz', 'driver' => 'pdo_mysql'), [
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), 'url' => '//foo:bar@localhost/baz',
), 'driver' => 'pdo_mysql',
'URL without scheme but custom driver' => array( ],
array('url' => '//foo:bar@localhost/baz', 'driverClass' => 'Doctrine\Tests\Mocks\DriverMock'), [
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driverClass' => 'Doctrine\Tests\Mocks\DriverMock'), 'user' => 'foo',
), 'password' => 'bar',
'URL without scheme but default PDO driver and default driver' => array( 'host' => 'localhost',
array('url' => '//foo:bar@localhost/baz', 'pdo' => true, 'driver' => 'pdo_mysql'), 'dbname' => 'baz',
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), 'driver' => PDOMySQLDriver::class,
), ],
'URL without scheme but driver and custom driver' => array( ],
array('url' => '//foo:bar@localhost/baz', 'driver' => 'pdo_mysql', 'driverClass' => 'Doctrine\Tests\Mocks\DriverMock'), 'URL without scheme but custom driver' => [
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driverClass' => 'Doctrine\Tests\Mocks\DriverMock'), [
), 'url' => '//foo:bar@localhost/baz',
'URL with default PDO driver' => array( 'driverClass' => DriverMock::class,
array('url' => 'mysql://foo:bar@localhost/baz', 'pdo' => true), ],
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), [
), 'user' => 'foo',
'URL with default driver' => array( 'password' => 'bar',
array('url' => 'mysql://foo:bar@localhost/baz', 'driver' => 'sqlite'), 'host' => 'localhost',
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), 'dbname' => 'baz',
), 'driverClass' => DriverMock::class,
'URL with default custom driver' => array( ],
array('url' => 'mysql://foo:bar@localhost/baz', 'driverClass' => 'Doctrine\Tests\Mocks\DriverMock'), ],
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), 'URL without scheme but default PDO driver and default driver' => [
), [
'URL with default PDO driver and default driver' => array( 'url' => '//foo:bar@localhost/baz',
array('url' => 'mysql://foo:bar@localhost/baz', 'pdo' => true, 'driver' => 'sqlite'), 'pdo' => true,
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), 'driver' => 'pdo_mysql',
), ],
'URL with default driver and default custom driver' => array( [
array('url' => 'mysql://foo:bar@localhost/baz', 'driver' => 'sqlite', 'driverClass' => 'Doctrine\Tests\Mocks\DriverMock'), 'user' => 'foo',
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), 'password' => 'bar',
), 'host' => 'localhost',
'URL with default PDO driver and default driver and default custom driver' => array( 'dbname' => 'baz',
array('url' => 'mysql://foo:bar@localhost/baz', 'pdo' => true, 'driver' => 'sqlite', 'driverClass' => 'Doctrine\Tests\Mocks\DriverMock'), 'driver' => PDOMySQLDriver::class,
array('user' => 'foo', 'password' => 'bar', 'host' => 'localhost', 'dbname' => 'baz', 'driver' => 'Doctrine\DBAL\Driver\PDOMySQL\Driver'), ],
), ],
); 'URL without scheme but driver and custom driver' => [
[
'url' => '//foo:bar@localhost/baz',
'driver' => 'pdo_mysql',
'driverClass' => DriverMock::class,
],
[
'user' => 'foo',
'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driverClass' => DriverMock::class,
],
],
'URL with default PDO driver' => [
[
'url' => 'mysql://foo:bar@localhost/baz',
'pdo' => true,
],
[
'user' => 'foo',
'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
'URL with default driver' => [
[
'url' => 'mysql://foo:bar@localhost/baz',
'driver' => 'sqlite',
],
[
'user' => 'foo',
'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
'URL with default custom driver' => [
[
'url' => 'mysql://foo:bar@localhost/baz',
'driverClass' => DriverMock::class,
],
[
'user' => 'foo',
'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
'URL with default PDO driver and default driver' => [
[
'url' => 'mysql://foo:bar@localhost/baz',
'pdo' => true,
'driver' => 'sqlite',
],
[
'user' => 'foo',
'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
'URL with default driver and default custom driver' => [
[
'url' => 'mysql://foo:bar@localhost/baz',
'driver' => 'sqlite',
'driverClass' => DriverMock::class,
],
[
'user' => 'foo',
'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
'URL with default PDO driver and default driver and default custom driver' => [
[
'url' => 'mysql://foo:bar@localhost/baz',
'pdo' => true,
'driver' => 'sqlite',
'driverClass' => DriverMock::class,
],
[
'user' => 'foo',
'password' => 'bar',
'host' => 'localhost',
'dbname' => 'baz',
'driver' => PDOMySQLDriver::class,
],
],
];
} }
} }
tests/Doctrine/Tests/DBAL/Functional/BlobTest.php
View file @ be4253f5
...@@ -54,26 +54,43 @@ class BlobTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -54,26 +54,43 @@ class BlobTest extends \Doctrine\Tests\DbalFunctionalTestCase
public function testSelect() public function testSelect()
{ {
$this->_conn->insert('blob_table', $this->_conn->insert('blob_table', [
array('id' => 1, 'clobfield' => 'test', 'blobfield' => 'test', 'binaryfield' => 'test'), 'id' => 1,
array(ParameterType::INTEGER, ParameterType::STRING, ParameterType::LARGE_OBJECT, ParameterType::LARGE_OBJECT) 'clobfield' => 'test',
); 'blobfield' => 'test',
'binaryfield' => 'test',
], [
ParameterType::INTEGER,
ParameterType::STRING,
ParameterType::LARGE_OBJECT,
ParameterType::LARGE_OBJECT,
]);
$this->assertBlobContains('test'); $this->assertBlobContains('test');
} }
public function testUpdate() public function testUpdate()
{ {
$this->_conn->insert('blob_table', $this->_conn->insert('blob_table', [
array('id' => 1, 'clobfield' => 'test', 'blobfield' => 'test', 'binaryfield' => 'test'), 'id' => 1,
array(ParameterType::INTEGER, ParameterType::STRING, ParameterType::LARGE_OBJECT, ParameterType::LARGE_OBJECT) 'clobfield' => 'test',
); 'blobfield' => 'test',
'binaryfield' => 'test',
$this->_conn->update('blob_table', ], [
array('blobfield' => 'test2', 'binaryfield' => 'test2'), ParameterType::INTEGER,
array('id' => 1), ParameterType::STRING,
array(ParameterType::LARGE_OBJECT, ParameterType::LARGE_OBJECT, ParameterType::INTEGER) ParameterType::LARGE_OBJECT,
); ParameterType::LARGE_OBJECT,
]);
$this->_conn->update('blob_table', [
'blobfield' => 'test2',
'binaryfield' => 'test2',
], ['id' => 1], [
ParameterType::LARGE_OBJECT,
ParameterType::LARGE_OBJECT,
ParameterType::INTEGER,
]);
$this->assertBlobContains('test2'); $this->assertBlobContains('test2');
$this->assertBinaryContains('test2'); $this->assertBinaryContains('test2');
......
tests/Doctrine/Tests/DBAL/Functional/PortabilityTest.php
View file @ be4253f5
...@@ -128,7 +128,7 @@ class PortabilityTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -128,7 +128,7 @@ class PortabilityTest extends \Doctrine\Tests\DbalFunctionalTestCase
self::assertArrayHasKey('test_string', $row, "Case should be lowered."); self::assertArrayHasKey('test_string', $row, "Case should be lowered.");
self::assertEquals(3, strlen($row['test_string']), "test_string should be rtrimed to length of three for CHAR(32) column."); self::assertEquals(3, strlen($row['test_string']), "test_string should be rtrimed to length of three for CHAR(32) column.");
self::assertNull($row['test_null']); self::assertNull($row['test_null']);
self::assertArrayNotHasKey(0, $row, "The row should not contain numerical keys."); self::assertArrayNotHasKey(0, $row, 'The row should not contain numerical keys.');
} }
/** /**
......
tests/Doctrine/Tests/DBAL/Functional/StatementTest.php
View file @ be4253f5
...@@ -104,9 +104,7 @@ d+N0hqezcjblboJ3Bj8ARJilHX4FAAA= ...@@ -104,9 +104,7 @@ d+N0hqezcjblboJ3Bj8ARJilHX4FAAA=
EOF EOF
); );
$this->_conn->insert('stmt_long_blob', array( $this->_conn->insert('stmt_long_blob', ['contents' => $contents], [ParameterType::LARGE_OBJECT]);
'contents' => $contents,
), array(ParameterType::LARGE_OBJECT));
$stmt = $this->_conn->prepare('SELECT contents FROM stmt_long_blob'); $stmt = $this->_conn->prepare('SELECT contents FROM stmt_long_blob');
$stmt->execute(); $stmt->execute();
......
tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL630Test.php
View file @ be4253f5
...@@ -55,8 +55,8 @@ class DBAL630Test extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -55,8 +55,8 @@ class DBAL630Test extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
$this->_conn->executeUpdate( $this->_conn->executeUpdate(
'INSERT INTO dbal630 (bool_col) VALUES(?)', 'INSERT INTO dbal630 (bool_col) VALUES(?)',
array('false'), ['false'],
array(ParameterType::BOOLEAN) [ParameterType::BOOLEAN]
); );
$id = $this->_conn->lastInsertId('dbal630_id_seq'); $id = $this->_conn->lastInsertId('dbal630_id_seq');
self::assertNotEmpty($id); self::assertNotEmpty($id);
......
tests/Doctrine/Tests/DBAL/Functional/WriteTest.php
View file @ be4253f5
...@@ -32,10 +32,10 @@ class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -32,10 +32,10 @@ class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase
public function testExecuteUpdateFirstTypeIsNull() public function testExecuteUpdateFirstTypeIsNull()
{ {
$sql = "INSERT INTO write_table (test_string, test_int) VALUES (?, ?)"; $sql = "INSERT INTO write_table (test_string, test_int) VALUES (?, ?)";
$this->_conn->executeUpdate($sql, array("text", 1111), array(null, ParameterType::INTEGER)); $this->_conn->executeUpdate($sql, ['text', 1111], [null, ParameterType::INTEGER]);
$sql = "SELECT * FROM write_table WHERE test_string = ? AND test_int = ?"; $sql = "SELECT * FROM write_table WHERE test_string = ? AND test_int = ?";
self::assertTrue((bool)$this->_conn->fetchColumn($sql, array("text", 1111))); self::assertTrue((bool) $this->_conn->fetchColumn($sql, ['text', 1111]));
} }
public function testExecuteUpdate() public function testExecuteUpdate()
...@@ -51,8 +51,8 @@ class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -51,8 +51,8 @@ class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase
$sql = "INSERT INTO write_table (test_int, test_string) VALUES (?, ?)"; $sql = "INSERT INTO write_table (test_int, test_string) VALUES (?, ?)";
$affected = $this->_conn->executeUpdate( $affected = $this->_conn->executeUpdate(
$sql, $sql,
array(1, 'foo'), [1, 'foo'],
array(ParameterType::INTEGER, ParameterType::STRING) [ParameterType::INTEGER, ParameterType::STRING]
); );
self::assertEquals(1, $affected, "executeUpdate() should return the number of affected rows!"); self::assertEquals(1, $affected, "executeUpdate() should return the number of affected rows!");
...@@ -76,7 +76,7 @@ class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase ...@@ -76,7 +76,7 @@ class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase
$stmt = $this->_conn->prepare($sql); $stmt = $this->_conn->prepare($sql);
$stmt->bindValue(1, 1, ParameterType::INTEGER); $stmt->bindValue(1, 1, ParameterType::INTEGER);
$stmt->bindValue(2, "foo", ParameterType::STRING); $stmt->bindValue(2, 'foo', ParameterType::STRING);
$stmt->execute(); $stmt->execute();
self::assertEquals(1, $stmt->rowCount()); self::assertEquals(1, $stmt->rowCount());
......
tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php
View file @ be4253f5
...@@ -874,7 +874,10 @@ class QueryBuilderTest extends \Doctrine\Tests\DbalTestCase ...@@ -874,7 +874,10 @@ class QueryBuilderTest extends \Doctrine\Tests\DbalTestCase
$qb->where('is_active = :isActive'); $qb->where('is_active = :isActive');
$qb->setParameter('isActive', true, ParameterType::BOOLEAN); $qb->setParameter('isActive', true, ParameterType::BOOLEAN);
self::assertSame(array('name' => ParameterType::STRING, 'isActive' => ParameterType::BOOLEAN), $qb->getParameterTypes()); self::assertSame([
'name' => ParameterType::STRING,
'isActive' => ParameterType::BOOLEAN,
], $qb->getParameterTypes());
} }
/** /**
......
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