Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"cweagans/composer-patches": "^1.7",
"deepdiver/zipstreamer": "^2.0.3",
"deepdiver1975/tarstreamer": "^2.1.0",
"doctrine/dbal": "^3.10.2",
"doctrine/dbal": "^3.10.4",
"egulias/email-validator": "^4.0.2",
"fusonic/opengraph": "^2.3.0",
"giggsey/libphonenumber-for-php-lite": "^8.13.48",
Expand Down
28 changes: 14 additions & 14 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -450,17 +450,17 @@
},
{
"name": "doctrine/dbal",
"version": "3.10.2",
"version_normalized": "3.10.2.0",
"version": "3.10.4",
"version_normalized": "3.10.4.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "c6c16cf787eaba3112203dfcd715fa2059c62282"
"reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/c6c16cf787eaba3112203dfcd715fa2059c62282",
"reference": "c6c16cf787eaba3112203dfcd715fa2059c62282",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/63a46cb5aa6f60991186cc98c1d1b50c09311868",
"reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868",
"shasum": ""
},
"require": {
Expand All @@ -476,21 +476,21 @@
},
"require-dev": {
"doctrine/cache": "^1.11|^2.0",
"doctrine/coding-standard": "13.0.1",
"doctrine/coding-standard": "14.0.0",
"fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.1",
"phpstan/phpstan": "2.1.22",
"phpstan/phpstan": "2.1.30",
"phpstan/phpstan-strict-rules": "^2",
"phpunit/phpunit": "9.6.23",
"slevomat/coding-standard": "8.16.2",
"squizlabs/php_codesniffer": "3.13.1",
"symfony/cache": "^5.4|^6.0|^7.0",
"symfony/console": "^4.4|^5.4|^6.0|^7.0"
"phpunit/phpunit": "9.6.29",
"slevomat/coding-standard": "8.24.0",
"squizlabs/php_codesniffer": "4.0.0",
"symfony/cache": "^5.4|^6.0|^7.0|^8.0",
"symfony/console": "^4.4|^5.4|^6.0|^7.0|^8.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
},
"time": "2025-09-04T23:51:27+00:00",
"time": "2025-11-29T10:46:08+00:00",
"bin": [
"bin/doctrine-dbal"
],
Expand Down Expand Up @@ -547,7 +547,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.10.2"
"source": "https://github.com/doctrine/dbal/tree/3.10.4"
},
"funding": [
{
Expand Down
6 changes: 3 additions & 3 deletions composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
'dev_requirement' => false,
),
'doctrine/dbal' => array(
'pretty_version' => '3.10.2',
'version' => '3.10.2.0',
'reference' => 'c6c16cf787eaba3112203dfcd715fa2059c62282',
'pretty_version' => '3.10.4',
'version' => '3.10.4.0',
'reference' => '63a46cb5aa6f60991186cc98c1d1b50c09311868',
'type' => 'library',
'install_path' => __DIR__ . '/../doctrine/dbal',
'aliases' => array(),
Expand Down
10 changes: 5 additions & 5 deletions doctrine/dbal/src/Driver/AbstractDB2Driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use function version_compare;

/**
* Abstract base implementation of the {@see Driver} interface for IBM DB2 based drivers.
* Abstract base implementation of the {@see Driver} interface for Db2 based drivers.
*/
abstract class AbstractDB2Driver implements VersionAwarePlatformDriver
{
Expand Down Expand Up @@ -66,17 +66,17 @@ public function createDatabasePlatformForVersion($version)
Deprecation::trigger(
'doctrine/dbal',
'https://github.com/doctrine/dbal/pull/5156',
'IBM DB2 < 11.1 support is deprecated and will be removed in DBAL 4.'
. ' Consider upgrading to IBM DB2 11.1 or later.',
'Db2 < 11.1 support is deprecated and will be removed in DBAL 4.'
. ' Consider upgrading to Db2 11.1 or later.',
);

return $this->getDatabasePlatform();
}

/**
* Detects IBM DB2 server version
* Detects Db2 server version
*
* @param string $versionString Version string as returned by IBM DB2 server, i.e. 'DB2/LINUXX8664 11.5.8.0'
* @param string $versionString Version string as returned by Db2 server, i.e. 'DB2/LINUXX8664 11.5.8.0'
*
* @throws DBALException
*/
Expand Down
2 changes: 1 addition & 1 deletion doctrine/dbal/src/Driver/IBMDB2/DataSourceName.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use function strpos;

/**
* IBM DB2 DSN
* Db2 DSN
*/
final class DataSourceName
{
Expand Down
3 changes: 2 additions & 1 deletion doctrine/dbal/src/Driver/IBMDB2/Statement.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ private function bindLobs(): array
foreach ($this->lobs as $param => $value) {
if (is_resource($value)) {
$handle = $handles[] = $this->createTemporaryFile();
$path = stream_get_meta_data($handle)['uri'];
$path = stream_get_meta_data($handle)['uri'] ?? null;
assert($path !== null);

$this->copyStreamToStream($value, $handle);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
use mysqli_sql_exception;
use ReflectionProperty;

use const PHP_VERSION_ID;

/** @internal */
final class ConnectionError extends AbstractException
{
Expand All @@ -20,7 +22,9 @@ public static function new(mysqli $connection): self
public static function upcast(mysqli_sql_exception $exception): self
{
$p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
$p->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$p->setAccessible(true);
}

return new self($exception->getMessage(), $p->getValue($exception), (int) $exception->getCode(), $exception);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

use function assert;

use const PHP_VERSION_ID;

/** @internal */
final class ConnectionFailed extends AbstractException
{
Expand All @@ -25,7 +27,9 @@ public static function new(mysqli $connection): self
public static function upcast(mysqli_sql_exception $exception): self
{
$p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
$p->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$p->setAccessible(true);
}

return new self($exception->getMessage(), $p->getValue($exception), (int) $exception->getCode(), $exception);
}
Expand Down
6 changes: 5 additions & 1 deletion doctrine/dbal/src/Driver/Mysqli/Exception/InvalidCharset.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

use function sprintf;

use const PHP_VERSION_ID;

/** @internal */
final class InvalidCharset extends AbstractException
{
Expand All @@ -26,7 +28,9 @@ public static function fromCharset(mysqli $connection, string $charset): self
public static function upcast(mysqli_sql_exception $exception, string $charset): self
{
$p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
$p->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$p->setAccessible(true);
}

return new self(
sprintf('Failed to set charset "%s": %s', $charset, $exception->getMessage()),
Expand Down
6 changes: 5 additions & 1 deletion doctrine/dbal/src/Driver/Mysqli/Exception/StatementError.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
use mysqli_stmt;
use ReflectionProperty;

use const PHP_VERSION_ID;

/** @internal */
final class StatementError extends AbstractException
{
Expand All @@ -20,7 +22,9 @@ public static function new(mysqli_stmt $statement): self
public static function upcast(mysqli_sql_exception $exception): self
{
$p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
$p->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$p->setAccessible(true);
}

return new self($exception->getMessage(), $p->getValue($exception), (int) $exception->getCode(), $exception);
}
Expand Down
3 changes: 3 additions & 0 deletions doctrine/dbal/src/Driver/PDO/PDOConnect.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Doctrine\DBAL\Driver\PDO;

use PDO;
use SensitiveParameter;

use const PHP_VERSION_ID;

Expand All @@ -13,8 +14,10 @@ trait PDOConnect
{
/** @param array<int, mixed> $options */
private function doConnect(
#[SensitiveParameter]
string $dsn,
string $username,
#[SensitiveParameter]
string $password,
array $options
): PDO {
Expand Down
4 changes: 2 additions & 2 deletions doctrine/dbal/src/Platforms/DB2111Platform.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
use function sprintf;

/**
* Provides the behavior, features and SQL dialect of the IBM DB2 11.1 (11.1 GA) database platform.
* Provides the behavior, features and SQL dialect of the Db2 11.1 (11.1 GA) database platform.
*
* @deprecated This class will be merged with {@see DB2Platform} in 4.0 because support for IBM DB2
* @deprecated This class will be merged with {@see DB2Platform} in 4.0 because support for Db2
* releases prior to 11.1 will be dropped.
*
* @see https://www.ibm.com/docs/en/db2/11.1?topic=database-whats-new-db2-version-111-ga
Expand Down
14 changes: 7 additions & 7 deletions doctrine/dbal/src/Platforms/DB2Platform.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
use function strpos;

/**
* Provides the behavior, features and SQL dialect of the IBM DB2 database platform of the oldest supported version.
* Provides the behavior, features and SQL dialect of the Db2 database platform of the oldest supported version.
*/
class DB2Platform extends AbstractPlatform
{
Expand Down Expand Up @@ -104,7 +104,7 @@ public function getBinaryDefaultLength()
*/
public function getVarcharTypeDeclarationSQL(array $column)
{
// for IBM DB2, the CHAR max length is less than VARCHAR default length
// for Db2, the CHAR max length is less than VARCHAR default length
if (! isset($column['length']) && ! empty($column['fixed'])) {
$column['length'] = $this->getCharMaxLength();
}
Expand Down Expand Up @@ -175,7 +175,7 @@ protected function getVarcharTypeDeclarationSQLSnippet($length, $fixed/*, $lengt
Deprecation::trigger(
'doctrine/dbal',
'https://github.com/doctrine/dbal/issues/3263',
'Relying on the default string column length on IBM DB2 is deprecated'
'Relying on the default string column length on Db2 is deprecated'
. ', specify the length explicitly.',
);
}
Expand All @@ -193,8 +193,8 @@ protected function getBinaryTypeDeclarationSQLSnippet($length, $fixed/*, $length
Deprecation::trigger(
'doctrine/dbal',
'https://github.com/doctrine/dbal/issues/3263',
'Relying on the default binary column length on IBM DB2 is deprecated'
. ', specify the length explicitly.',
'Relying on the default binary column length on Db2 is deprecated'
. ', specify the length explicitly.',
);
}

Expand Down Expand Up @@ -1004,9 +1004,9 @@ public function getDummySelectSQL()
/**
* {@inheritDoc}
*
* DB2 supports savepoints, but they work semantically different than on other vendor platforms.
* Db2 supports savepoints, but they work semantically different than on other vendor platforms.
*
* TODO: We have to investigate how to get DB2 up and running with savepoints.
* TODO: We have to investigate how to get Db2 up and running with savepoints.
*/
public function supportsSavepoints()
{
Expand Down
2 changes: 1 addition & 1 deletion doctrine/dbal/src/Platforms/Keywords/DB2Keywords.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Doctrine\Deprecations\Deprecation;

/**
* DB2 Keywords.
* Db2 Keywords.
*/
class DB2Keywords extends KeywordList
{
Expand Down
2 changes: 1 addition & 1 deletion doctrine/dbal/src/Schema/DB2SchemaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
use const CASE_LOWER;

/**
* IBM Db2 Schema Manager.
* Db2 Schema Manager.
*
* @extends AbstractSchemaManager<DB2Platform>
*/
Expand Down
Loading