Skip to content

Commit b9476e7

Browse files
committed
Merge pull request #2854 from Majkl578/strict-types
Enable strict types
2 parents dadcec8 + 4bfa567 commit b9476e7

File tree

409 files changed

+949
-99
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

+949
-99
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: 4 additions & 2 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;
@@ -180,7 +182,7 @@ public function beginTransaction() : void
180182
public function commit() : void
181183
{
182184
if (! oci_commit($this->dbh)) {
183-
throw OCI8Exception::fromErrorInfo($this->errorInfo());
185+
throw OCI8Exception::fromErrorInfo(oci_error($this->dbh));
184186
}
185187

186188
$this->executeMode = OCI_COMMIT_ON_SUCCESS;
@@ -192,7 +194,7 @@ public function commit() : void
192194
public function rollBack() : void
193195
{
194196
if (! oci_rollback($this->dbh)) {
195-
throw OCI8Exception::fromErrorInfo($this->errorInfo());
197+
throw OCI8Exception::fromErrorInfo(oci_error($this->dbh));
196198
}
197199

198200
$this->executeMode = OCI_COMMIT_ON_SUCCESS;

lib/Doctrine/DBAL/Driver/OCI8/OCI8Exception.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\AbstractDriverException;

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

Lines changed: 4 additions & 2 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;
@@ -296,7 +298,7 @@ public function bindParam($column, &$variable, $type = ParameterType::STRING, $l
296298
$length ?? -1,
297299
$this->convertParameterType($type)
298300
)) {
299-
throw OCI8Exception::fromErrorInfo($this->errorInfo());
301+
throw OCI8Exception::fromErrorInfo(oci_error($this->_sth));
300302
}
301303
}
302304

@@ -388,7 +390,7 @@ public function execute($params = null) : void
388390

389391
$ret = @oci_execute($this->_sth, $this->_conn->getExecuteMode());
390392
if (! $ret) {
391-
throw OCI8Exception::fromErrorInfo($this->errorInfo());
393+
throw OCI8Exception::fromErrorInfo(oci_error($this->_sth));
392394
}
393395

394396
$this->result = true;

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;

0 commit comments

Comments
 (0)