Skip to content

Commit 086aa07

Browse files
nickvergessennickvergessen
authored
Merge pull request #2234 from nextcloud/dependabot/composer/doctrine/dbal-3.10.4
build(deps): bump doctrine/dbal from 3.10.2 to 3.10.4
2 parents 7a108f8 + 3d1f8b8 commit 086aa07

19 files changed

Lines changed: 125 additions & 142 deletions

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"cweagans/composer-patches": "^1.7",
2626
"deepdiver/zipstreamer": "^2.0.3",
2727
"deepdiver1975/tarstreamer": "^2.1.0",
28-
"doctrine/dbal": "^3.10.2",
28+
"doctrine/dbal": "^3.10.4",
2929
"egulias/email-validator": "^4.0.4",
3030
"fusonic/opengraph": "^3.0.0",
3131
"giggsey/libphonenumber-for-php-lite": "^9.0.9",

‎composer.lock‎

Lines changed: 25 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎composer/installed.json‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -449,17 +449,17 @@
449449
},
450450
{
451451
"name": "doctrine/dbal",
452-
"version": "3.10.2",
453-
"version_normalized": "3.10.2.0",
452+
"version": "3.10.4",
453+
"version_normalized": "3.10.4.0",
454454
"source": {
455455
"type": "git",
456456
"url": "https://github.com/doctrine/dbal.git",
457-
"reference": "c6c16cf787eaba3112203dfcd715fa2059c62282"
457+
"reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868"
458458
},
459459
"dist": {
460460
"type": "zip",
461-
"url": "https://api.github.com/repos/doctrine/dbal/zipball/c6c16cf787eaba3112203dfcd715fa2059c62282",
462-
"reference": "c6c16cf787eaba3112203dfcd715fa2059c62282",
461+
"url": "https://api.github.com/repos/doctrine/dbal/zipball/63a46cb5aa6f60991186cc98c1d1b50c09311868",
462+
"reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868",
463463
"shasum": ""
464464
},
465465
"require": {
@@ -475,21 +475,21 @@
475475
},
476476
"require-dev": {
477477
"doctrine/cache": "^1.11|^2.0",
478-
"doctrine/coding-standard": "13.0.1",
478+
"doctrine/coding-standard": "14.0.0",
479479
"fig/log-test": "^1",
480480
"jetbrains/phpstorm-stubs": "2023.1",
481-
"phpstan/phpstan": "2.1.22",
481+
"phpstan/phpstan": "2.1.30",
482482
"phpstan/phpstan-strict-rules": "^2",
483-
"phpunit/phpunit": "9.6.23",
484-
"slevomat/coding-standard": "8.16.2",
485-
"squizlabs/php_codesniffer": "3.13.1",
486-
"symfony/cache": "^5.4|^6.0|^7.0",
487-
"symfony/console": "^4.4|^5.4|^6.0|^7.0"
483+
"phpunit/phpunit": "9.6.29",
484+
"slevomat/coding-standard": "8.24.0",
485+
"squizlabs/php_codesniffer": "4.0.0",
486+
"symfony/cache": "^5.4|^6.0|^7.0|^8.0",
487+
"symfony/console": "^4.4|^5.4|^6.0|^7.0|^8.0"
488488
},
489489
"suggest": {
490490
"symfony/console": "For helpful console commands such as SQL execution and import of files."
491491
},
492-
"time": "2025-09-04T23:51:27+00:00",
492+
"time": "2025-11-29T10:46:08+00:00",
493493
"bin": [
494494
"bin/doctrine-dbal"
495495
],
@@ -546,7 +546,7 @@
546546
],
547547
"support": {
548548
"issues": "https://github.com/doctrine/dbal/issues",
549-
"source": "https://github.com/doctrine/dbal/tree/3.10.2"
549+
"source": "https://github.com/doctrine/dbal/tree/3.10.4"
550550
},
551551
"funding": [
552552
{
@@ -617,33 +617,32 @@
617617
},
618618
{
619619
"name": "doctrine/event-manager",
620-
"version": "1.2.0",
621-
"version_normalized": "1.2.0.0",
620+
"version": "2.0.1",
621+
"version_normalized": "2.0.1.0",
622622
"source": {
623623
"type": "git",
624624
"url": "https://github.com/doctrine/event-manager.git",
625-
"reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520"
625+
"reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e"
626626
},
627627
"dist": {
628628
"type": "zip",
629-
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520",
630-
"reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520",
629+
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e",
630+
"reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e",
631631
"shasum": ""
632632
},
633633
"require": {
634-
"doctrine/deprecations": "^0.5.3 || ^1",
635-
"php": "^7.1 || ^8.0"
634+
"php": "^8.1"
636635
},
637636
"conflict": {
638637
"doctrine/common": "<2.9"
639638
},
640639
"require-dev": {
641-
"doctrine/coding-standard": "^9 || ^10",
642-
"phpstan/phpstan": "~1.4.10 || ^1.8.8",
643-
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
644-
"vimeo/psalm": "^4.24"
640+
"doctrine/coding-standard": "^12",
641+
"phpstan/phpstan": "^1.8.8",
642+
"phpunit/phpunit": "^10.5",
643+
"vimeo/psalm": "^5.24"
645644
},
646-
"time": "2022-10-12T20:51:15+00:00",
645+
"time": "2024-05-22T20:47:39+00:00",
647646
"type": "library",
648647
"installation-source": "dist",
649648
"autoload": {
@@ -692,7 +691,7 @@
692691
],
693692
"support": {
694693
"issues": "https://github.com/doctrine/event-manager/issues",
695-
"source": "https://github.com/doctrine/event-manager/tree/1.2.0"
694+
"source": "https://github.com/doctrine/event-manager/tree/2.0.1"
696695
},
697696
"funding": [
698697
{

‎composer/installed.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
'dev_requirement' => false,
7575
),
7676
'doctrine/dbal' => array(
77-
'pretty_version' => '3.10.2',
78-
'version' => '3.10.2.0',
79-
'reference' => 'c6c16cf787eaba3112203dfcd715fa2059c62282',
77+
'pretty_version' => '3.10.4',
78+
'version' => '3.10.4.0',
79+
'reference' => '63a46cb5aa6f60991186cc98c1d1b50c09311868',
8080
'type' => 'library',
8181
'install_path' => __DIR__ . '/../doctrine/dbal',
8282
'aliases' => array(),
@@ -92,9 +92,9 @@
9292
'dev_requirement' => false,
9393
),
9494
'doctrine/event-manager' => array(
95-
'pretty_version' => '1.2.0',
96-
'version' => '1.2.0.0',
97-
'reference' => '95aa4cb529f1e96576f3fda9f5705ada4056a520',
95+
'pretty_version' => '2.0.1',
96+
'version' => '2.0.1.0',
97+
'reference' => 'b680156fa328f1dfd874fd48c7026c41570b9c6e',
9898
'type' => 'library',
9999
'install_path' => __DIR__ . '/../doctrine/event-manager',
100100
'aliases' => array(),

‎doctrine/dbal/src/Driver/AbstractDB2Driver.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use function version_compare;
1919

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

7373
return $this->getDatabasePlatform();
7474
}
7575

7676
/**
77-
* Detects IBM DB2 server version
77+
* Detects Db2 server version
7878
*
79-
* @param string $versionString Version string as returned by IBM DB2 server, i.e. 'DB2/LINUXX8664 11.5.8.0'
79+
* @param string $versionString Version string as returned by Db2 server, i.e. 'DB2/LINUXX8664 11.5.8.0'
8080
*
8181
* @throws DBALException
8282
*/

‎doctrine/dbal/src/Driver/IBMDB2/DataSourceName.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use function strpos;
1212

1313
/**
14-
* IBM DB2 DSN
14+
* Db2 DSN
1515
*/
1616
final class DataSourceName
1717
{

‎doctrine/dbal/src/Driver/IBMDB2/Statement.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ private function bindLobs(): array
174174
foreach ($this->lobs as $param => $value) {
175175
if (is_resource($value)) {
176176
$handle = $handles[] = $this->createTemporaryFile();
177-
$path = stream_get_meta_data($handle)['uri'];
177+
$path = stream_get_meta_data($handle)['uri'] ?? null;
178+
assert($path !== null);
178179

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

‎doctrine/dbal/src/Driver/Mysqli/Exception/ConnectionError.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
use mysqli_sql_exception;
1010
use ReflectionProperty;
1111

12+
use const PHP_VERSION_ID;
13+
1214
/** @internal */
1315
final class ConnectionError extends AbstractException
1416
{
@@ -20,7 +22,9 @@ public static function new(mysqli $connection): self
2022
public static function upcast(mysqli_sql_exception $exception): self
2123
{
2224
$p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
23-
$p->setAccessible(true);
25+
if (PHP_VERSION_ID < 80100) {
26+
$p->setAccessible(true);
27+
}
2428

2529
return new self($exception->getMessage(), $p->getValue($exception), (int) $exception->getCode(), $exception);
2630
}

‎doctrine/dbal/src/Driver/Mysqli/Exception/ConnectionFailed.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
use function assert;
1313

14+
use const PHP_VERSION_ID;
15+
1416
/** @internal */
1517
final class ConnectionFailed extends AbstractException
1618
{
@@ -25,7 +27,9 @@ public static function new(mysqli $connection): self
2527
public static function upcast(mysqli_sql_exception $exception): self
2628
{
2729
$p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
28-
$p->setAccessible(true);
30+
if (PHP_VERSION_ID < 80100) {
31+
$p->setAccessible(true);
32+
}
2933

3034
return new self($exception->getMessage(), $p->getValue($exception), (int) $exception->getCode(), $exception);
3135
}

‎doctrine/dbal/src/Driver/Mysqli/Exception/InvalidCharset.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
use function sprintf;
1313

14+
use const PHP_VERSION_ID;
15+
1416
/** @internal */
1517
final class InvalidCharset extends AbstractException
1618
{
@@ -26,7 +28,9 @@ public static function fromCharset(mysqli $connection, string $charset): self
2628
public static function upcast(mysqli_sql_exception $exception, string $charset): self
2729
{
2830
$p = new ReflectionProperty(mysqli_sql_exception::class, 'sqlstate');
29-
$p->setAccessible(true);
31+
if (PHP_VERSION_ID < 80100) {
32+
$p->setAccessible(true);
33+
}
3034

3135
return new self(
3236
sprintf('Failed to set charset "%s": %s', $charset, $exception->getMessage()),

0 commit comments

Comments
 (0)