Skip to content

Commit beb6031

Browse files
committed
Enable strict types
1 parent 8cb2fb6 commit beb6031

File tree

409 files changed

+942
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+942
-94
lines changed

bin/doctrine-dbal.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
use Doctrine\DBAL\Tools\Console\ConsoleRunner;
46
use Symfony\Component\Console\Helper\HelperSet;
57

lib/Doctrine/DBAL/Cache/ArrayStatement.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Cache;
46

57
use ArrayIterator;

lib/Doctrine/DBAL/Cache/CacheException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Cache;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Cache/QueryCacheProfile.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Cache;
46

57
use Doctrine\Common\Cache\Cache;

lib/Doctrine/DBAL/Cache/ResultCacheStatement.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Cache;
46

57
use ArrayIterator;

lib/Doctrine/DBAL/ColumnCase.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL;
46

57
/**

lib/Doctrine/DBAL/Configuration.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL;
46

57
use Doctrine\Common\Cache\Cache;

lib/Doctrine/DBAL/Connection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL;
46

57
use Closure;

lib/Doctrine/DBAL/ConnectionException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL;
46

57
class ConnectionException extends DBALException

lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Connections;
46

57
use Doctrine\Common\EventManager;

lib/Doctrine/DBAL/DBALException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL;
46

57
use Doctrine\DBAL\Driver\DriverException as DriverExceptionInterface;

lib/Doctrine/DBAL/Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL;
46

57
use Doctrine\DBAL\Platforms\AbstractPlatform;

lib/Doctrine/DBAL/Driver/AbstractDB2Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Doctrine\DBAL\Connection;

lib/Doctrine/DBAL/Driver/AbstractDriverException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Exception;

lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Doctrine\DBAL\Connection;

lib/Doctrine/DBAL/Driver/AbstractOracleDriver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Doctrine\DBAL\Connection;

lib/Doctrine/DBAL/Driver/AbstractPostgreSQLDriver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Doctrine\DBAL\Connection;

lib/Doctrine/DBAL/Driver/AbstractSQLAnywhereDriver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Doctrine\DBAL\Connection;

lib/Doctrine/DBAL/Driver/AbstractSQLServerDriver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Doctrine\DBAL\Connection;

lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Doctrine\DBAL\Connection;

lib/Doctrine/DBAL/Driver/Connection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/DriverException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use Throwable;

lib/Doctrine/DBAL/Driver/ExceptionConverterDriver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
/**

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=0);
4+
35
namespace Doctrine\DBAL\Driver\IBMDB2;
46

57
use Doctrine\DBAL\Driver\Connection;

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\IBMDB2;
46

57
use Doctrine\DBAL\Driver\AbstractDB2Driver;

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Exception.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\IBMDB2;
46

57
use Doctrine\DBAL\Driver\AbstractDriverException;

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\IBMDB2;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/Mysqli/Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\Mysqli;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\Mysqli;
46

57
use Doctrine\DBAL\Driver\Connection;
@@ -47,17 +49,17 @@ class MysqliConnection implements Connection, PingableConnection, ServerInfoAwar
4749
*/
4850
public function __construct(array $params, $username, $password, array $driverOptions = [])
4951
{
50-
$port = $params['port'] ?? ini_get('mysqli.default_port');
52+
$port = $params['port'] ?? (int) ini_get('mysqli.default_port');
5153

5254
// Fallback to default MySQL port if not given.
5355
if (! $port) {
5456
$port = 3306;
5557
}
5658

5759
$socket = $params['unix_socket'] ?? ini_get('mysqli.default_socket');
58-
$dbname = $params['dbname'] ?? null;
60+
$dbname = $params['dbname'] ?? '';
5961

60-
$flags = $driverOptions[static::OPTION_FLAGS] ?? null;
62+
$flags = $driverOptions[static::OPTION_FLAGS] ?? 0;
6163

6264
$this->conn = mysqli_init();
6365

lib/Doctrine/DBAL/Driver/Mysqli/MysqliException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\Mysqli;
46

57
use Doctrine\DBAL\Driver\AbstractDriverException;

lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\Mysqli;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/OCI8/Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\OCI8;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\OCI8;
46

57
use Doctrine\DBAL\Driver\Connection;

lib/Doctrine/DBAL/Driver/OCI8/OCI8Exception.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\OCI8;
46

57
use Doctrine\DBAL\Driver\AbstractDriverException;
@@ -17,6 +19,6 @@ public static function fromErrorInfo($error)
1719
return new self('Database error occurred but no error information was retrieved from the driver.');
1820
}
1921

20-
return new self($error['message'], null, $error['code']);
22+
return new self($error['message'] ?? 'An unknown error occurred.', null, $error['code'] ?? 0);
2123
}
2224
}

lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\OCI8;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/PDOConnection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
use PDO;

lib/Doctrine/DBAL/Driver/PDOException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver;
46

57
/**

lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\PDOMySql;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\PDOOracle;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\PDOPgSql;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\PDOSqlite;
46

57
use Doctrine\DBAL\DBALException;

lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\PDOSqlsrv;
46

57
use Doctrine\DBAL\Driver\PDOConnection;

lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\PDOSqlsrv;
46

57
use Doctrine\DBAL\Driver\AbstractSQLServerDriver;

lib/Doctrine/DBAL/Driver/PDOSqlsrv/Statement.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Doctrine\DBAL\Driver\PDOSqlsrv;
46

57
use Doctrine\DBAL\Driver\PDOStatement;

0 commit comments

Comments
 (0)