Skip to content

Commit 4e2aa66

Browse files
susnuxsusnux
authored
Merge pull request #2035 from nextcloud/dependabot/composer/stable31/doctrine/dbal-3.9.4
build(deps): Bump doctrine/dbal from 3.9.1 to 3.9.4
2 parents e0778e5 + 8d39d86 commit 4e2aa66

File tree

126 files changed

+303
-445
lines changed

Some content is hidden

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

126 files changed

+303
-445
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,12 @@ doctrine/dbal/.doctrine-project.json
6161
doctrine/dbal/.gitmodules
6262
doctrine/dbal/build.*
6363
doctrine/dbal/docs
64+
doctrine/dbal/phpstan-baseline.neon
6465
doctrine/dbal/run-all.sh
6566
doctrine/dbal/static-analysis
6667

6768
doctrine/event-manager/phpstan.neon.dist
69+
doctrine/event-manager/psalm-baseline.xml
6870

6971
fusonic/linq/examples/
7072

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"cweagans/composer-patches": "^1.7",
2424
"deepdiver/zipstreamer": "^2.0.3",
2525
"deepdiver1975/tarstreamer": "^2.1.0",
26-
"doctrine/dbal": "^3.9.1",
26+
"doctrine/dbal": "^3.9.4",
2727
"egulias/email-validator": "^4.0.2",
2828
"fusonic/opengraph": "^2.3.0",
2929
"giggsey/libphonenumber-for-php-lite": "^8.13.48",

‎composer.lock‎

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

‎composer/autoload_classmap.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,6 +1413,7 @@
14131413
'Doctrine\\DBAL\\Exception\\SyntaxErrorException' => $vendorDir . '/doctrine/dbal/src/Exception/SyntaxErrorException.php',
14141414
'Doctrine\\DBAL\\Exception\\TableExistsException' => $vendorDir . '/doctrine/dbal/src/Exception/TableExistsException.php',
14151415
'Doctrine\\DBAL\\Exception\\TableNotFoundException' => $vendorDir . '/doctrine/dbal/src/Exception/TableNotFoundException.php',
1416+
'Doctrine\\DBAL\\Exception\\TransactionRolledBack' => $vendorDir . '/doctrine/dbal/src/Exception/TransactionRolledBack.php',
14161417
'Doctrine\\DBAL\\Exception\\UniqueConstraintViolationException' => $vendorDir . '/doctrine/dbal/src/Exception/UniqueConstraintViolationException.php',
14171418
'Doctrine\\DBAL\\ExpandArrayParameters' => $vendorDir . '/doctrine/dbal/src/ExpandArrayParameters.php',
14181419
'Doctrine\\DBAL\\FetchMode' => $vendorDir . '/doctrine/dbal/src/FetchMode.php',

‎composer/autoload_static.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,6 +1946,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
19461946
'Doctrine\\DBAL\\Exception\\SyntaxErrorException' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/SyntaxErrorException.php',
19471947
'Doctrine\\DBAL\\Exception\\TableExistsException' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/TableExistsException.php',
19481948
'Doctrine\\DBAL\\Exception\\TableNotFoundException' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/TableNotFoundException.php',
1949+
'Doctrine\\DBAL\\Exception\\TransactionRolledBack' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/TransactionRolledBack.php',
19491950
'Doctrine\\DBAL\\Exception\\UniqueConstraintViolationException' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/UniqueConstraintViolationException.php',
19501951
'Doctrine\\DBAL\\ExpandArrayParameters' => __DIR__ . '/..' . '/doctrine/dbal/src/ExpandArrayParameters.php',
19511952
'Doctrine\\DBAL\\FetchMode' => __DIR__ . '/..' . '/doctrine/dbal/src/FetchMode.php',

‎composer/installed.json‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -546,17 +546,17 @@
546546
},
547547
{
548548
"name": "doctrine/dbal",
549-
"version": "3.9.1",
550-
"version_normalized": "3.9.1.0",
549+
"version": "3.9.4",
550+
"version_normalized": "3.9.4.0",
551551
"source": {
552552
"type": "git",
553553
"url": "https://github.com/doctrine/dbal.git",
554-
"reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7"
554+
"reference": "ec16c82f20be1a7224e65ac67144a29199f87959"
555555
},
556556
"dist": {
557557
"type": "zip",
558-
"url": "https://api.github.com/repos/doctrine/dbal/zipball/d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
559-
"reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
558+
"url": "https://api.github.com/repos/doctrine/dbal/zipball/ec16c82f20be1a7224e65ac67144a29199f87959",
559+
"reference": "ec16c82f20be1a7224e65ac67144a29199f87959",
560560
"shasum": ""
561561
},
562562
"require": {
@@ -572,20 +572,18 @@
572572
"doctrine/coding-standard": "12.0.0",
573573
"fig/log-test": "^1",
574574
"jetbrains/phpstorm-stubs": "2023.1",
575-
"phpstan/phpstan": "1.12.0",
576-
"phpstan/phpstan-strict-rules": "^1.6",
577-
"phpunit/phpunit": "9.6.20",
578-
"psalm/plugin-phpunit": "0.18.4",
575+
"phpstan/phpstan": "2.1.1",
576+
"phpstan/phpstan-strict-rules": "^2",
577+
"phpunit/phpunit": "9.6.22",
579578
"slevomat/coding-standard": "8.13.1",
580579
"squizlabs/php_codesniffer": "3.10.2",
581580
"symfony/cache": "^5.4|^6.0|^7.0",
582-
"symfony/console": "^4.4|^5.4|^6.0|^7.0",
583-
"vimeo/psalm": "4.30.0"
581+
"symfony/console": "^4.4|^5.4|^6.0|^7.0"
584582
},
585583
"suggest": {
586584
"symfony/console": "For helpful console commands such as SQL execution and import of files."
587585
},
588-
"time": "2024-09-01T13:49:23+00:00",
586+
"time": "2025-01-16T08:28:55+00:00",
589587
"bin": [
590588
"bin/doctrine-dbal"
591589
],
@@ -642,7 +640,7 @@
642640
],
643641
"support": {
644642
"issues": "https://github.com/doctrine/dbal/issues",
645-
"source": "https://github.com/doctrine/dbal/tree/3.9.1"
643+
"source": "https://github.com/doctrine/dbal/tree/3.9.4"
646644
},
647645
"funding": [
648646
{
@@ -710,33 +708,32 @@
710708
},
711709
{
712710
"name": "doctrine/event-manager",
713-
"version": "1.2.0",
714-
"version_normalized": "1.2.0.0",
711+
"version": "2.0.1",
712+
"version_normalized": "2.0.1.0",
715713
"source": {
716714
"type": "git",
717715
"url": "https://github.com/doctrine/event-manager.git",
718-
"reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520"
716+
"reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e"
719717
},
720718
"dist": {
721719
"type": "zip",
722-
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520",
723-
"reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520",
720+
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e",
721+
"reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e",
724722
"shasum": ""
725723
},
726724
"require": {
727-
"doctrine/deprecations": "^0.5.3 || ^1",
728-
"php": "^7.1 || ^8.0"
725+
"php": "^8.1"
729726
},
730727
"conflict": {
731728
"doctrine/common": "<2.9"
732729
},
733730
"require-dev": {
734-
"doctrine/coding-standard": "^9 || ^10",
735-
"phpstan/phpstan": "~1.4.10 || ^1.8.8",
736-
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
737-
"vimeo/psalm": "^4.24"
731+
"doctrine/coding-standard": "^12",
732+
"phpstan/phpstan": "^1.8.8",
733+
"phpunit/phpunit": "^10.5",
734+
"vimeo/psalm": "^5.24"
738735
},
739-
"time": "2022-10-12T20:51:15+00:00",
736+
"time": "2024-05-22T20:47:39+00:00",
740737
"type": "library",
741738
"installation-source": "dist",
742739
"autoload": {
@@ -785,7 +782,7 @@
785782
],
786783
"support": {
787784
"issues": "https://github.com/doctrine/event-manager/issues",
788-
"source": "https://github.com/doctrine/event-manager/tree/1.2.0"
785+
"source": "https://github.com/doctrine/event-manager/tree/2.0.1"
789786
},
790787
"funding": [
791788
{

‎composer/installed.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
'dev_requirement' => false,
8484
),
8585
'doctrine/dbal' => array(
86-
'pretty_version' => '3.9.1',
87-
'version' => '3.9.1.0',
88-
'reference' => 'd7dc08f98cba352b2bab5d32c5e58f7e745c11a7',
86+
'pretty_version' => '3.9.4',
87+
'version' => '3.9.4.0',
88+
'reference' => 'ec16c82f20be1a7224e65ac67144a29199f87959',
8989
'type' => 'library',
9090
'install_path' => __DIR__ . '/../doctrine/dbal',
9191
'aliases' => array(),
@@ -101,9 +101,9 @@
101101
'dev_requirement' => false,
102102
),
103103
'doctrine/event-manager' => array(
104-
'pretty_version' => '1.2.0',
105-
'version' => '1.2.0.0',
106-
'reference' => '95aa4cb529f1e96576f3fda9f5705ada4056a520',
104+
'pretty_version' => '2.0.1',
105+
'version' => '2.0.1.0',
106+
'reference' => 'b680156fa328f1dfd874fd48c7026c41570b9c6e',
107107
'type' => 'library',
108108
'install_path' => __DIR__ . '/../doctrine/event-manager',
109109
'aliases' => array(),

‎doctrine/dbal/src/ArrayParameterType.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ final class ArrayParameterType
2727
/**
2828
* @internal
2929
*
30-
* @psalm-param self::* $type
30+
* @phpstan-param self::* $type
3131
*
32-
* @psalm-return ParameterType::INTEGER|ParameterType::STRING|ParameterType::ASCII|ParameterType::BINARY
32+
* @phpstan-return ParameterType::INTEGER|ParameterType::STRING|ParameterType::ASCII|ParameterType::BINARY
3333
*/
3434
public static function toElementParameterType(int $type): int
3535
{

‎doctrine/dbal/src/ArrayParameters/Exception/MissingNamedParameter.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
use function sprintf;
99

10-
/** @psalm-immutable */
1110
class MissingNamedParameter extends LogicException implements Exception
1211
{
1312
public static function new(string $name): self

‎doctrine/dbal/src/ArrayParameters/Exception/MissingPositionalParameter.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77

88
use function sprintf;
99

10-
/**
11-
* @internal
12-
*
13-
* @psalm-immutable
14-
*/
10+
/** @internal */
1511
class MissingPositionalParameter extends LogicException implements Exception
1612
{
1713
public static function new(int $index): self

0 commit comments

Comments
 (0)