Skip to content

build(deps): bump doctrine/dbal from 3.10.2 to 3.10.4 #2234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Dec 18, 2025
Merged

build(deps): bump doctrine/dbal from 3.10.2 to 3.10.4 #2234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfd1c3a
build(deps): bump doctrine/dbal from 3.10.2 to 3.10.4
dependabot[bot] Dec 18, 2025
3d1f8b8
chore(autoloader): Dump autoloader
nextcloud-command Dec 18, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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.4",
"fusonic/opengraph": "^3.0.0",
"giggsey/libphonenumber-for-php-lite": "^9.0.9",
Expand Down
51 changes: 25 additions & 26 deletions composer.lock
View file
Open in desktop

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

53 changes: 26 additions & 27 deletions composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,17 +449,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 @@ -475,21 +475,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 @@ -546,7 +546,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 Expand Up @@ -617,33 +617,32 @@
},
{
"name": "doctrine/event-manager",
"version": "1.2.0",
"version_normalized": "1.2.0.0",
"version": "2.0.1",
"version_normalized": "2.0.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/event-manager.git",
"reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520"
"reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520",
"reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520",
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e",
"reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e",
"shasum": ""
},
"require": {
"doctrine/deprecations": "^0.5.3 || ^1",
"php": "^7.1 || ^8.0"
"php": "^8.1"
},
"conflict": {
"doctrine/common": "<2.9"
},
"require-dev": {
"doctrine/coding-standard": "^9 || ^10",
"phpstan/phpstan": "~1.4.10 || ^1.8.8",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"vimeo/psalm": "^4.24"
"doctrine/coding-standard": "^12",
"phpstan/phpstan": "^1.8.8",
"phpunit/phpunit": "^10.5",
"vimeo/psalm": "^5.24"
},
"time": "2022-10-12T20:51:15+00:00",
"time": "2024-05-22T20:47:39+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand Down Expand Up @@ -692,7 +691,7 @@
],
"support": {
"issues": "https://github.com/doctrine/event-manager/issues",
"source": "https://github.com/doctrine/event-manager/tree/1.2.0"
"source": "https://github.com/doctrine/event-manager/tree/2.0.1"
},
"funding": [
{
Expand Down
12 changes: 6 additions & 6 deletions composer/installed.php
View file
Open in desktop
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 All @@ -92,9 +92,9 @@
'dev_requirement' => false,
),
'doctrine/event-manager' => array(
'pretty_version' => '1.2.0',
'version' => '1.2.0.0',
'reference' => '95aa4cb529f1e96576f3fda9f5705ada4056a520',
'pretty_version' => '2.0.1',
'version' => '2.0.1.0',
'reference' => 'b680156fa328f1dfd874fd48c7026c41570b9c6e',
'type' => 'library',
'install_path' => __DIR__ . '/../doctrine/event-manager',
'aliases' => array(),
Expand Down
10 changes: 5 additions & 5 deletions doctrine/dbal/src/Driver/AbstractDB2Driver.php
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
6 changes: 5 additions & 1 deletion doctrine/dbal/src/Driver/Mysqli/Exception/ConnectionError.php
View file
Open in desktop
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
6 changes: 5 additions & 1 deletion doctrine/dbal/src/Driver/Mysqli/Exception/ConnectionFailed.php
View file
Open in desktop
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
View file
Open in desktop
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
Loading