From 0cbc86c9138fdc33773e71eea914e9882c2068ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 12:45:43 +0000 Subject: [PATCH 1/2] [skip ci] build(deps): bump doctrine/dbal from 3.10.4 to 3.10.7 Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.10.4 to 3.10.7. - [Release notes](https://github.com/doctrine/dbal/releases) - [Commits](https://github.com/doctrine/dbal/compare/3.10.4...3.10.7) --- updated-dependencies: - dependency-name: doctrine/dbal dependency-version: 3.10.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 56 +++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 28c581f61..28fa02e3c 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "cweagans/composer-patches": "^1.7", "deepdiver/zipstreamer": "^2.0.3", "deepdiver1975/tarstreamer": "^2.1.0", - "doctrine/dbal": "^3.10.4", + "doctrine/dbal": "^3.10.7", "egulias/email-validator": "^4.0.4", "fusonic/opengraph": "^3.0.0", "giggsey/libphonenumber-for-php-lite": "^9.0.43", diff --git a/composer.lock b/composer.lock index fc82c940d..5c9a19021 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2d560e08c4f7cfb2fffd279aea5b238c", + "content-hash": "210323cbb8cf2518028c35e42dccceda", "packages": [ { "name": "aws/aws-crt-php", @@ -434,16 +434,16 @@ }, { "name": "doctrine/dbal", - "version": "3.10.4", + "version": "3.10.7", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868" + "reference": "92156a662c2e177a1c9305711a0ef3ee94dcdd2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/63a46cb5aa6f60991186cc98c1d1b50c09311868", - "reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/92156a662c2e177a1c9305711a0ef3ee94dcdd2c", + "reference": "92156a662c2e177a1c9305711a0ef3ee94dcdd2c", "shasum": "" }, "require": { @@ -462,11 +462,11 @@ "doctrine/coding-standard": "14.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "2.1.30", + "phpstan/phpstan": "2.3.4", "phpstan/phpstan-strict-rules": "^2", - "phpunit/phpunit": "9.6.29", - "slevomat/coding-standard": "8.24.0", - "squizlabs/php_codesniffer": "4.0.0", + "phpunit/phpunit": "9.6.36", + "slevomat/coding-standard": "8.31.1", + "squizlabs/php_codesniffer": "4.0.4", "symfony/cache": "^5.4|^6.0|^7.0|^8.0", "symfony/console": "^4.4|^5.4|^6.0|^7.0|^8.0" }, @@ -528,7 +528,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.10.4" + "source": "https://github.com/doctrine/dbal/tree/3.10.7" }, "funding": [ { @@ -544,24 +544,24 @@ "type": "tidelift" } ], - "time": "2025-11-29T10:46:08+00:00" + "time": "2026-11-08T21:35:21+00:00" }, { "name": "doctrine/deprecations", - "version": "1.1.6", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca" + "reference": "d2e16653a734c8784c1851ad68b02f997b53ca82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", - "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d2e16653a734c8784c1851ad68b02f997b53ca82", + "reference": "d2e16653a734c8784c1851ad68b02f997b53ca82", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.4 || ^8.0" }, "conflict": { "phpunit/phpunit": "<=7.5 || >=14" @@ -590,22 +590,22 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.6" + "source": "https://github.com/doctrine/deprecations/tree/1.2.0" }, - "time": "2026-02-07T07:09:04+00:00" + "time": "2026-11-11T10:04:49+00:00" }, { "name": "doctrine/event-manager", - "version": "2.0.1", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e" + "reference": "dda33921b198841ca8dbad2eaa5d4d34769d18cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e", - "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/dda33921b198841ca8dbad2eaa5d4d34769d18cf", + "reference": "dda33921b198841ca8dbad2eaa5d4d34769d18cf", "shasum": "" }, "require": { @@ -615,10 +615,10 @@ "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^12", - "phpstan/phpstan": "^1.8.8", - "phpunit/phpunit": "^10.5", - "vimeo/psalm": "^5.24" + "doctrine/coding-standard": "^14", + "phpdocumentor/guides-cli": "^1.4", + "phpstan/phpstan": "^2.1.32", + "phpunit/phpunit": "^10.5.58" }, "type": "library", "autoload": { @@ -667,7 +667,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/2.0.1" + "source": "https://github.com/doctrine/event-manager/tree/2.1.1" }, "funding": [ { @@ -683,7 +683,7 @@ "type": "tidelift" } ], - "time": "2024-05-22T20:47:39+00:00" + "time": "2026-01-29T07:11:08+00:00" }, { "name": "doctrine/lexer", From c533b75f57f7f10aa6186513600f2971366479a1 Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Tue, 17 Nov 2026 09:15:21 +0000 Subject: [PATCH 2/2] chore(autoloader): Dump autoloader Signed-off-by: nextcloud-command --- composer/autoload_classmap.php | 7 ++ composer/autoload_static.php | 7 ++ composer/installed.json | 60 ++++++++--------- composer/installed.php | 18 ++--- .../Driver/API/MySQL/ExceptionConverter.php | 1 + .../dbal/src/Driver/AbstractMySQLDriver.php | 5 ++ .../Exception/CannotCopyStreamToStream.php | 2 +- .../Exception/CannotCreateTemporaryFile.php | 2 +- .../Driver/IBMDB2/Exception/PrepareFailed.php | 2 +- doctrine/dbal/src/Exception.php | 6 +- .../Platforms/Keywords/MariaDb123Keywords.php | 48 ++++++++++++++ .../src/Platforms/MariaDb120300Platform.php | 26 ++++++++ doctrine/dbal/src/Query/QueryBuilder.php | 40 +++++------ .../Console/Command/ReservedWordsCommand.php | 3 + doctrine/deprecations/src/Deprecation.php | 45 ++++++++----- .../src/PHPUnit/VerifyDeprecations.php | 24 ++++--- .../event-manager/src/EventDispatcher.php | 24 +++++++ .../src/EventListenerIntrospector.php | 34 ++++++++++ .../src/EventListenerRegistry.php | 26 ++++++++ doctrine/event-manager/src/EventManager.php | 66 ++++--------------- .../src/EventManagerInterface.php | 13 ++++ .../src/EventSubscriberRegistry.php | 27 ++++++++ 22 files changed, 344 insertions(+), 142 deletions(-) create mode 100644 doctrine/dbal/src/Platforms/Keywords/MariaDb123Keywords.php create mode 100644 doctrine/dbal/src/Platforms/MariaDb120300Platform.php create mode 100644 doctrine/event-manager/src/EventDispatcher.php create mode 100644 doctrine/event-manager/src/EventListenerIntrospector.php create mode 100644 doctrine/event-manager/src/EventListenerRegistry.php create mode 100644 doctrine/event-manager/src/EventManagerInterface.php create mode 100644 doctrine/event-manager/src/EventSubscriberRegistry.php diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php index 5205af30a..735b4c63d 100644 --- a/composer/autoload_classmap.php +++ b/composer/autoload_classmap.php @@ -536,8 +536,13 @@ 'DateRangeError' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateRangeError.php', 'Deprecated' => $vendorDir . '/symfony/polyfill-php84/Resources/stubs/Deprecated.php', 'Doctrine\\Common\\EventArgs' => $vendorDir . '/doctrine/event-manager/src/EventArgs.php', + 'Doctrine\\Common\\EventDispatcher' => $vendorDir . '/doctrine/event-manager/src/EventDispatcher.php', + 'Doctrine\\Common\\EventListenerIntrospector' => $vendorDir . '/doctrine/event-manager/src/EventListenerIntrospector.php', + 'Doctrine\\Common\\EventListenerRegistry' => $vendorDir . '/doctrine/event-manager/src/EventListenerRegistry.php', 'Doctrine\\Common\\EventManager' => $vendorDir . '/doctrine/event-manager/src/EventManager.php', + 'Doctrine\\Common\\EventManagerInterface' => $vendorDir . '/doctrine/event-manager/src/EventManagerInterface.php', 'Doctrine\\Common\\EventSubscriber' => $vendorDir . '/doctrine/event-manager/src/EventSubscriber.php', + 'Doctrine\\Common\\EventSubscriberRegistry' => $vendorDir . '/doctrine/event-manager/src/EventSubscriberRegistry.php', 'Doctrine\\Common\\Lexer\\AbstractLexer' => $vendorDir . '/doctrine/lexer/src/AbstractLexer.php', 'Doctrine\\Common\\Lexer\\Token' => $vendorDir . '/doctrine/lexer/src/Token.php', 'Doctrine\\DBAL\\ArrayParameterType' => $vendorDir . '/doctrine/dbal/src/ArrayParameterType.php', @@ -728,6 +733,7 @@ 'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDBKeywords' => $vendorDir . '/doctrine/dbal/src/Platforms/Keywords/MariaDBKeywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDb102Keywords' => $vendorDir . '/doctrine/dbal/src/Platforms/Keywords/MariaDb102Keywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDb117Keywords' => $vendorDir . '/doctrine/dbal/src/Platforms/Keywords/MariaDb117Keywords.php', + 'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDb123Keywords' => $vendorDir . '/doctrine/dbal/src/Platforms/Keywords/MariaDb123Keywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MySQL57Keywords' => $vendorDir . '/doctrine/dbal/src/Platforms/Keywords/MySQL57Keywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MySQL80Keywords' => $vendorDir . '/doctrine/dbal/src/Platforms/Keywords/MySQL80Keywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MySQL84Keywords' => $vendorDir . '/doctrine/dbal/src/Platforms/Keywords/MySQL84Keywords.php', @@ -747,6 +753,7 @@ 'Doctrine\\DBAL\\Platforms\\MariaDb1052Platform' => $vendorDir . '/doctrine/dbal/src/Platforms/MariaDb1052Platform.php', 'Doctrine\\DBAL\\Platforms\\MariaDb1060Platform' => $vendorDir . '/doctrine/dbal/src/Platforms/MariaDb1060Platform.php', 'Doctrine\\DBAL\\Platforms\\MariaDb110700Platform' => $vendorDir . '/doctrine/dbal/src/Platforms/MariaDb110700Platform.php', + 'Doctrine\\DBAL\\Platforms\\MariaDb120300Platform' => $vendorDir . '/doctrine/dbal/src/Platforms/MariaDb120300Platform.php', 'Doctrine\\DBAL\\Platforms\\MySQL57Platform' => $vendorDir . '/doctrine/dbal/src/Platforms/MySQL57Platform.php', 'Doctrine\\DBAL\\Platforms\\MySQL80Platform' => $vendorDir . '/doctrine/dbal/src/Platforms/MySQL80Platform.php', 'Doctrine\\DBAL\\Platforms\\MySQL84Platform' => $vendorDir . '/doctrine/dbal/src/Platforms/MySQL84Platform.php', diff --git a/composer/autoload_static.php b/composer/autoload_static.php index 9c1f16742..ff72c8c54 100644 --- a/composer/autoload_static.php +++ b/composer/autoload_static.php @@ -1068,8 +1068,13 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'DateRangeError' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateRangeError.php', 'Deprecated' => __DIR__ . '/..' . '/symfony/polyfill-php84/Resources/stubs/Deprecated.php', 'Doctrine\\Common\\EventArgs' => __DIR__ . '/..' . '/doctrine/event-manager/src/EventArgs.php', + 'Doctrine\\Common\\EventDispatcher' => __DIR__ . '/..' . '/doctrine/event-manager/src/EventDispatcher.php', + 'Doctrine\\Common\\EventListenerIntrospector' => __DIR__ . '/..' . '/doctrine/event-manager/src/EventListenerIntrospector.php', + 'Doctrine\\Common\\EventListenerRegistry' => __DIR__ . '/..' . '/doctrine/event-manager/src/EventListenerRegistry.php', 'Doctrine\\Common\\EventManager' => __DIR__ . '/..' . '/doctrine/event-manager/src/EventManager.php', + 'Doctrine\\Common\\EventManagerInterface' => __DIR__ . '/..' . '/doctrine/event-manager/src/EventManagerInterface.php', 'Doctrine\\Common\\EventSubscriber' => __DIR__ . '/..' . '/doctrine/event-manager/src/EventSubscriber.php', + 'Doctrine\\Common\\EventSubscriberRegistry' => __DIR__ . '/..' . '/doctrine/event-manager/src/EventSubscriberRegistry.php', 'Doctrine\\Common\\Lexer\\AbstractLexer' => __DIR__ . '/..' . '/doctrine/lexer/src/AbstractLexer.php', 'Doctrine\\Common\\Lexer\\Token' => __DIR__ . '/..' . '/doctrine/lexer/src/Token.php', 'Doctrine\\DBAL\\ArrayParameterType' => __DIR__ . '/..' . '/doctrine/dbal/src/ArrayParameterType.php', @@ -1260,6 +1265,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDBKeywords' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/Keywords/MariaDBKeywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDb102Keywords' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/Keywords/MariaDb102Keywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDb117Keywords' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/Keywords/MariaDb117Keywords.php', + 'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDb123Keywords' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/Keywords/MariaDb123Keywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MySQL57Keywords' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/Keywords/MySQL57Keywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MySQL80Keywords' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/Keywords/MySQL80Keywords.php', 'Doctrine\\DBAL\\Platforms\\Keywords\\MySQL84Keywords' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/Keywords/MySQL84Keywords.php', @@ -1279,6 +1285,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'Doctrine\\DBAL\\Platforms\\MariaDb1052Platform' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/MariaDb1052Platform.php', 'Doctrine\\DBAL\\Platforms\\MariaDb1060Platform' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/MariaDb1060Platform.php', 'Doctrine\\DBAL\\Platforms\\MariaDb110700Platform' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/MariaDb110700Platform.php', + 'Doctrine\\DBAL\\Platforms\\MariaDb120300Platform' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/MariaDb120300Platform.php', 'Doctrine\\DBAL\\Platforms\\MySQL57Platform' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/MySQL57Platform.php', 'Doctrine\\DBAL\\Platforms\\MySQL80Platform' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/MySQL80Platform.php', 'Doctrine\\DBAL\\Platforms\\MySQL84Platform' => __DIR__ . '/..' . '/doctrine/dbal/src/Platforms/MySQL84Platform.php', diff --git a/composer/installed.json b/composer/installed.json index b58d8edfe..e22b73c77 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -449,17 +449,17 @@ }, { "name": "doctrine/dbal", - "version": "3.10.4", - "version_normalized": "3.10.4.0", + "version": "3.10.7", + "version_normalized": "3.10.7.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868" + "reference": "92156a662c2e177a1c9305711a0ef3ee94dcdd2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/63a46cb5aa6f60991186cc98c1d1b50c09311868", - "reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/92156a662c2e177a1c9305711a0ef3ee94dcdd2c", + "reference": "92156a662c2e177a1c9305711a0ef3ee94dcdd2c", "shasum": "" }, "require": { @@ -478,18 +478,18 @@ "doctrine/coding-standard": "14.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "2.1.30", + "phpstan/phpstan": "2.3.4", "phpstan/phpstan-strict-rules": "^2", - "phpunit/phpunit": "9.6.29", - "slevomat/coding-standard": "8.24.0", - "squizlabs/php_codesniffer": "4.0.0", + "phpunit/phpunit": "9.6.36", + "slevomat/coding-standard": "8.31.1", + "squizlabs/php_codesniffer": "4.0.4", "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-11-29T10:46:08+00:00", + "time": "2026-11-08T21:35:21+00:00", "bin": [ "bin/doctrine-dbal" ], @@ -546,7 +546,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.10.4" + "source": "https://github.com/doctrine/dbal/tree/3.10.7" }, "funding": [ { @@ -566,21 +566,21 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.6", - "version_normalized": "1.1.6.0", + "version": "1.2.0", + "version_normalized": "1.2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca" + "reference": "d2e16653a734c8784c1851ad68b02f997b53ca82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", - "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d2e16653a734c8784c1851ad68b02f997b53ca82", + "reference": "d2e16653a734c8784c1851ad68b02f997b53ca82", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.4 || ^8.0" }, "conflict": { "phpunit/phpunit": "<=7.5 || >=14" @@ -595,7 +595,7 @@ "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" }, - "time": "2026-02-07T07:09:04+00:00", + "time": "2026-11-11T10:04:49+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -611,23 +611,23 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.6" + "source": "https://github.com/doctrine/deprecations/tree/1.2.0" }, "install-path": "../doctrine/deprecations" }, { "name": "doctrine/event-manager", - "version": "2.0.1", - "version_normalized": "2.0.1.0", + "version": "2.1.1", + "version_normalized": "2.1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e" + "reference": "dda33921b198841ca8dbad2eaa5d4d34769d18cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e", - "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/dda33921b198841ca8dbad2eaa5d4d34769d18cf", + "reference": "dda33921b198841ca8dbad2eaa5d4d34769d18cf", "shasum": "" }, "require": { @@ -637,12 +637,12 @@ "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^12", - "phpstan/phpstan": "^1.8.8", - "phpunit/phpunit": "^10.5", - "vimeo/psalm": "^5.24" + "doctrine/coding-standard": "^14", + "phpdocumentor/guides-cli": "^1.4", + "phpstan/phpstan": "^2.1.32", + "phpunit/phpunit": "^10.5.58" }, - "time": "2024-05-22T20:47:39+00:00", + "time": "2026-01-29T07:11:08+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -691,7 +691,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/2.0.1" + "source": "https://github.com/doctrine/event-manager/tree/2.1.1" }, "funding": [ { diff --git a/composer/installed.php b/composer/installed.php index dee03bed5..93361c94d 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -74,27 +74,27 @@ 'dev_requirement' => false, ), 'doctrine/dbal' => array( - 'pretty_version' => '3.10.4', - 'version' => '3.10.4.0', - 'reference' => '63a46cb5aa6f60991186cc98c1d1b50c09311868', + 'pretty_version' => '3.10.7', + 'version' => '3.10.7.0', + 'reference' => '92156a662c2e177a1c9305711a0ef3ee94dcdd2c', 'type' => 'library', 'install_path' => __DIR__ . '/../doctrine/dbal', 'aliases' => array(), 'dev_requirement' => false, ), 'doctrine/deprecations' => array( - 'pretty_version' => '1.1.6', - 'version' => '1.1.6.0', - 'reference' => 'd4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca', + 'pretty_version' => '1.2.0', + 'version' => '1.2.0.0', + 'reference' => 'd2e16653a734c8784c1851ad68b02f997b53ca82', 'type' => 'library', 'install_path' => __DIR__ . '/../doctrine/deprecations', 'aliases' => array(), 'dev_requirement' => false, ), 'doctrine/event-manager' => array( - 'pretty_version' => '2.0.1', - 'version' => '2.0.1.0', - 'reference' => 'b680156fa328f1dfd874fd48c7026c41570b9c6e', + 'pretty_version' => '2.1.1', + 'version' => '2.1.1.0', + 'reference' => 'dda33921b198841ca8dbad2eaa5d4d34769d18cf', 'type' => 'library', 'install_path' => __DIR__ . '/../doctrine/event-manager', 'aliases' => array(), diff --git a/doctrine/dbal/src/Driver/API/MySQL/ExceptionConverter.php b/doctrine/dbal/src/Driver/API/MySQL/ExceptionConverter.php index 10507afd7..79d9e027a 100644 --- a/doctrine/dbal/src/Driver/API/MySQL/ExceptionConverter.php +++ b/doctrine/dbal/src/Driver/API/MySQL/ExceptionConverter.php @@ -55,6 +55,7 @@ public function convert(Exception $exception, ?Query $query): DriverException case 1451: case 1452: case 1701: + case 4271: return new ForeignKeyConstraintViolationException($exception, $query); case 1062: diff --git a/doctrine/dbal/src/Driver/AbstractMySQLDriver.php b/doctrine/dbal/src/Driver/AbstractMySQLDriver.php index 1bb327033..4c142efc7 100644 --- a/doctrine/dbal/src/Driver/AbstractMySQLDriver.php +++ b/doctrine/dbal/src/Driver/AbstractMySQLDriver.php @@ -14,6 +14,7 @@ use Doctrine\DBAL\Platforms\MariaDb1052Platform; use Doctrine\DBAL\Platforms\MariaDb1060Platform; use Doctrine\DBAL\Platforms\MariaDb110700Platform; +use Doctrine\DBAL\Platforms\MariaDb120300Platform; use Doctrine\DBAL\Platforms\MySQL57Platform; use Doctrine\DBAL\Platforms\MySQL80Platform; use Doctrine\DBAL\Platforms\MySQL84Platform; @@ -43,6 +44,10 @@ public function createDatabasePlatformForVersion($version) if ($mariadb) { $mariaDbVersion = $this->getMariaDbMysqlVersionNumber($version); + if (version_compare($mariaDbVersion, '12.3.0', '>=')) { + return new MariaDb120300Platform(); + } + if (version_compare($mariaDbVersion, '11.7.0', '>=')) { return new MariaDb110700Platform(); } diff --git a/doctrine/dbal/src/Driver/IBMDB2/Exception/CannotCopyStreamToStream.php b/doctrine/dbal/src/Driver/IBMDB2/Exception/CannotCopyStreamToStream.php index 05099faf0..ee0aaf173 100644 --- a/doctrine/dbal/src/Driver/IBMDB2/Exception/CannotCopyStreamToStream.php +++ b/doctrine/dbal/src/Driver/IBMDB2/Exception/CannotCopyStreamToStream.php @@ -9,7 +9,7 @@ /** @internal */ final class CannotCopyStreamToStream extends AbstractException { - /** @param array{message: string}|null $error */ + /** @phpstan-param array{message: string, ...}|null $error */ public static function new(?array $error): self { $message = 'Could not copy source stream to temporary file'; diff --git a/doctrine/dbal/src/Driver/IBMDB2/Exception/CannotCreateTemporaryFile.php b/doctrine/dbal/src/Driver/IBMDB2/Exception/CannotCreateTemporaryFile.php index 70a355732..17f7d85ab 100644 --- a/doctrine/dbal/src/Driver/IBMDB2/Exception/CannotCreateTemporaryFile.php +++ b/doctrine/dbal/src/Driver/IBMDB2/Exception/CannotCreateTemporaryFile.php @@ -9,7 +9,7 @@ /** @internal */ final class CannotCreateTemporaryFile extends AbstractException { - /** @param array{message: string}|null $error */ + /** @phpstan-param array{message: string, ...}|null $error */ public static function new(?array $error): self { $message = 'Could not create temporary file'; diff --git a/doctrine/dbal/src/Driver/IBMDB2/Exception/PrepareFailed.php b/doctrine/dbal/src/Driver/IBMDB2/Exception/PrepareFailed.php index 95da1cdc3..3feb0da03 100644 --- a/doctrine/dbal/src/Driver/IBMDB2/Exception/PrepareFailed.php +++ b/doctrine/dbal/src/Driver/IBMDB2/Exception/PrepareFailed.php @@ -9,7 +9,7 @@ /** @internal */ final class PrepareFailed extends AbstractException { - /** @param array{message: string}|null $error */ + /** @phpstan-param array{message: string, ...}|null $error */ public static function new(?array $error): self { if ($error === null) { diff --git a/doctrine/dbal/src/Exception.php b/doctrine/dbal/src/Exception.php index 8475a140d..eb9697200 100644 --- a/doctrine/dbal/src/Exception.php +++ b/doctrine/dbal/src/Exception.php @@ -10,7 +10,7 @@ use function gettype; use function implode; use function is_object; -use function spl_object_hash; +use function spl_object_id; use function sprintf; class Exception extends \Exception @@ -128,14 +128,14 @@ public static function typeNotFound(string $name): self public static function typeNotRegistered(Type $type): self { return new self( - sprintf('Type of the class %s@%s is not registered.', get_class($type), spl_object_hash($type)), + sprintf('Type of the class %s@%d is not registered.', get_class($type), spl_object_id($type)), ); } public static function typeAlreadyRegistered(Type $type): self { return new self( - sprintf('Type of the class %s@%s is already registered.', get_class($type), spl_object_hash($type)), + sprintf('Type of the class %s@%d is already registered.', get_class($type), spl_object_id($type)), ); } } diff --git a/doctrine/dbal/src/Platforms/Keywords/MariaDb123Keywords.php b/doctrine/dbal/src/Platforms/Keywords/MariaDb123Keywords.php new file mode 100644 index 000000000..bb77eb638 --- /dev/null +++ b/doctrine/dbal/src/Platforms/Keywords/MariaDb123Keywords.php @@ -0,0 +1,48 @@ +join('u', 'phonenumbers', 'p', 'p.is_primary = 1'); * * - * @param string $fromAlias The alias that points to a from clause. - * @param string $join The table name to join. - * @param string $alias The alias of the join table. - * @param string $condition The condition for the join. + * @param string $fromAlias The alias that points to a from clause. + * @param string $join The table name to join. + * @param string $alias The alias of the join table. + * @param string|null $condition The condition for the join. * * @return $this This QueryBuilder instance. */ @@ -902,10 +902,10 @@ public function join($fromAlias, $join, $alias, $condition = null) * ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1'); * * - * @param string $fromAlias The alias that points to a from clause. - * @param string $join The table name to join. - * @param string $alias The alias of the join table. - * @param string $condition The condition for the join. + * @param string $fromAlias The alias that points to a from clause. + * @param string $join The table name to join. + * @param string $alias The alias of the join table. + * @param string|null $condition The condition for the join. * * @return $this This QueryBuilder instance. */ @@ -931,10 +931,10 @@ public function innerJoin($fromAlias, $join, $alias, $condition = null) * ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1'); * * - * @param string $fromAlias The alias that points to a from clause. - * @param string $join The table name to join. - * @param string $alias The alias of the join table. - * @param string $condition The condition for the join. + * @param string $fromAlias The alias that points to a from clause. + * @param string $join The table name to join. + * @param string $alias The alias of the join table. + * @param string|null $condition The condition for the join. * * @return $this This QueryBuilder instance. */ @@ -960,10 +960,10 @@ public function leftJoin($fromAlias, $join, $alias, $condition = null) * ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1'); * * - * @param string $fromAlias The alias that points to a from clause. - * @param string $join The table name to join. - * @param string $alias The alias of the join table. - * @param string $condition The condition for the join. + * @param string $fromAlias The alias that points to a from clause. + * @param string $join The table name to join. + * @param string $alias The alias of the join table. + * @param string|null $condition The condition for the join. * * @return $this This QueryBuilder instance. */ @@ -1293,8 +1293,8 @@ public function orHaving($having) * Specifies an ordering for the query results. * Replaces any previously specified orderings, if any. * - * @param string $sort The ordering expression. - * @param string $order The ordering direction. + * @param string $sort The ordering expression. + * @param string|null $order The ordering direction. * * @return $this This QueryBuilder instance. */ @@ -1306,8 +1306,8 @@ public function orderBy($sort, $order = null) /** * Adds an ordering to the query results. * - * @param string $sort The ordering expression. - * @param string $order The ordering direction. + * @param string $sort The ordering expression. + * @param string|null $order The ordering direction. * * @return $this This QueryBuilder instance. */ diff --git a/doctrine/dbal/src/Tools/Console/Command/ReservedWordsCommand.php b/doctrine/dbal/src/Tools/Console/Command/ReservedWordsCommand.php index 238af5ed6..52d7fdde2 100644 --- a/doctrine/dbal/src/Tools/Console/Command/ReservedWordsCommand.php +++ b/doctrine/dbal/src/Tools/Console/Command/ReservedWordsCommand.php @@ -8,6 +8,7 @@ use Doctrine\DBAL\Platforms\Keywords\KeywordList; use Doctrine\DBAL\Platforms\Keywords\MariaDb102Keywords; use Doctrine\DBAL\Platforms\Keywords\MariaDb117Keywords; +use Doctrine\DBAL\Platforms\Keywords\MariaDb123Keywords; use Doctrine\DBAL\Platforms\Keywords\MySQL57Keywords; use Doctrine\DBAL\Platforms\Keywords\MySQL80Keywords; use Doctrine\DBAL\Platforms\Keywords\MySQL84Keywords; @@ -59,6 +60,7 @@ public function __construct(ConnectionProvider $connectionProvider) 'db2' => new DB2Keywords(), 'mariadb102' => new MariaDb102Keywords(), 'mariadb117' => new MariaDb117Keywords(), + 'mariadb123' => new MariaDb123Keywords(), 'mysql' => new MySQLKeywords(), 'mysql57' => new MySQL57Keywords(), 'mysql80' => new MySQL80Keywords(), @@ -131,6 +133,7 @@ private function doConfigure(): void * db2 * mariadb102 * mariadb117 + * mariadb123 * mysql * mysql57 * mysql80 diff --git a/doctrine/deprecations/src/Deprecation.php b/doctrine/deprecations/src/Deprecation.php index 1801e6c7c..184840f16 100644 --- a/doctrine/deprecations/src/Deprecation.php +++ b/doctrine/deprecations/src/Deprecation.php @@ -40,6 +40,8 @@ * * Packages that trigger deprecations should use the `trigger()` or * `triggerIfCalledFromOutside()` methods. + * + * @final since 1.2 */ class Deprecation { @@ -49,22 +51,20 @@ class Deprecation private const TYPE_PSR_LOGGER = 4; /** @var int-mask-of|null */ - private static $type; + private static ?int $type = null; - /** @var LoggerInterface|null */ - private static $logger; + private static ?LoggerInterface $logger = null; /** @var array */ - private static $ignoredPackages = []; + private static array $ignoredPackages = []; /** @var array */ - private static $triggeredDeprecations = []; + private static array $triggeredDeprecations = []; /** @var array */ - private static $ignoredLinks = []; + private static array $ignoredLinks = []; - /** @var bool */ - private static $deduplication = true; + private static ?bool $deduplication = null; /** * Trigger a deprecation for the given package and identfier. @@ -93,7 +93,7 @@ public static function trigger(string $package, string $link, string $message, . self::$triggeredDeprecations[$link] = 1; } - if (self::$deduplication === true && self::$triggeredDeprecations[$link] > 1) { + if ((self::$deduplication ?? self::getDeduplicationFromEnv()) === true && self::$triggeredDeprecations[$link] > 1) { return; } @@ -160,7 +160,7 @@ public static function triggerIfCalledFromOutside(string $package, string $link, self::$triggeredDeprecations[$link] = 1; } - if (self::$deduplication === true && self::$triggeredDeprecations[$link] > 1) { + if ((self::$deduplication ?? self::getDeduplicationFromEnv()) === true && self::$triggeredDeprecations[$link] > 1) { return; } @@ -202,7 +202,7 @@ private static function delegateTriggerToBackend(string $message, array $backtra self::basename($backtrace[1]['file'] ?? 'native code'), $backtrace[1]['line'] ?? 0, $link, - $package + $package, ); @trigger_error($message, E_USER_DEPRECATED); @@ -224,19 +224,19 @@ private static function basename(string $filename): string public static function enableTrackingDeprecations(): void { - self::$type = self::$type ?? self::getTypeFromEnv(); - self::$type |= self::TYPE_TRACK_DEPRECATIONS; + self::$type ??= self::getTypeFromEnv(); + self::$type |= self::TYPE_TRACK_DEPRECATIONS; } public static function enableWithTriggerError(): void { - self::$type = self::$type ?? self::getTypeFromEnv(); - self::$type |= self::TYPE_TRIGGER_ERROR; + self::$type ??= self::getTypeFromEnv(); + self::$type |= self::TYPE_TRIGGER_ERROR; } public static function enableWithPsrLogger(LoggerInterface $logger): void { - self::$type = self::$type ?? self::getTypeFromEnv(); + self::$type ??= self::getTypeFromEnv(); self::$type |= self::TYPE_PSR_LOGGER; self::$logger = $logger; } @@ -250,7 +250,7 @@ public static function disable(): void { self::$type = self::TYPE_NONE; self::$logger = null; - self::$deduplication = true; + self::$deduplication = null; self::$ignoredLinks = []; foreach (self::$triggeredDeprecations as $link => $count) { @@ -306,4 +306,15 @@ private static function getTypeFromEnv(): int return self::$type; } + + private static function getDeduplicationFromEnv(): bool + { + $envValue = $_SERVER['DOCTRINE_DEPRECATIONS_DEDUPLICATION'] ?? $_ENV['DOCTRINE_DEPRECATIONS_DEDUPLICATION'] ?? null; + + if ($envValue === 'false' || $envValue === '0') { + return self::$deduplication = false; + } + + return self::$deduplication = true; + } } diff --git a/doctrine/deprecations/src/PHPUnit/VerifyDeprecations.php b/doctrine/deprecations/src/PHPUnit/VerifyDeprecations.php index 7e168bd2c..0093fd846 100644 --- a/doctrine/deprecations/src/PHPUnit/VerifyDeprecations.php +++ b/doctrine/deprecations/src/PHPUnit/VerifyDeprecations.php @@ -13,29 +13,37 @@ trait VerifyDeprecations { /** @var array */ - private $doctrineDeprecationsExpectations = []; + private array $doctrineDeprecationsExpectations = []; /** @var array */ - private $doctrineNoDeprecationsExpectations = []; + private array $doctrineNoDeprecationsExpectations = []; + /** @final since 1.2 */ public function expectDeprecationWithIdentifier(string $identifier): void { $this->doctrineDeprecationsExpectations[$identifier] = Deprecation::getTriggeredDeprecations()[$identifier] ?? 0; } + /** @final since 1.2 */ public function expectNoDeprecationWithIdentifier(string $identifier): void { $this->doctrineNoDeprecationsExpectations[$identifier] = Deprecation::getTriggeredDeprecations()[$identifier] ?? 0; } - /** @before */ + /** + * @before + * @final since 1.2 + */ #[Before] public function enableDeprecationTracking(): void { Deprecation::enableTrackingDeprecations(); } - /** @after */ + /** + * @after + * @final since 1.2 + */ #[After] public function verifyDeprecationsAreTriggered(): void { @@ -46,8 +54,8 @@ public function verifyDeprecationsAreTriggered(): void $actualCount > $expectation, sprintf( "Expected deprecation with identifier '%s' was not triggered by code executed in test.", - $identifier - ) + $identifier, + ), ); } @@ -58,8 +66,8 @@ public function verifyDeprecationsAreTriggered(): void $actualCount === $expectation, sprintf( "Deprecation with identifier '%s' was triggered by code executed in test, but expected not to.", - $identifier - ) + $identifier, + ), ); } } diff --git a/doctrine/event-manager/src/EventDispatcher.php b/doctrine/event-manager/src/EventDispatcher.php new file mode 100644 index 000000000..bc72817f6 --- /dev/null +++ b/doctrine/event-manager/src/EventDispatcher.php @@ -0,0 +1,24 @@ + + */ + public function getAllListeners(): array; + + /** + * Checks whether an event has any registered listeners. + */ + public function hasListeners(string $event): bool; +} diff --git a/doctrine/event-manager/src/EventListenerRegistry.php b/doctrine/event-manager/src/EventListenerRegistry.php new file mode 100644 index 000000000..bc8cd84c4 --- /dev/null +++ b/doctrine/event-manager/src/EventListenerRegistry.php @@ -0,0 +1,26 @@ +listeners[$eventName])) { @@ -42,86 +35,55 @@ public function dispatchEvent(string $eventName, EventArgs|null $eventArgs = nul } } - /** - * Gets the listeners of a specific event. - * - * @param string $event The name of the event. - * - * @return object[] - */ + /** {@inheritDoc} */ public function getListeners(string $event): array { return $this->listeners[$event] ?? []; } - /** - * Gets all listeners keyed by event name. - * - * @return array The event listeners for the specified event, or all event listeners. - */ + /** {@inheritDoc} */ public function getAllListeners(): array { return $this->listeners; } - /** - * Checks whether an event has any registered listeners. - */ + /** {@inheritDoc} */ public function hasListeners(string $event): bool { return ! empty($this->listeners[$event]); } - /** - * Adds an event listener that listens on the specified events. - * - * @param string|string[] $events The event(s) to listen on. - * @param object $listener The listener object. - */ + /** {@inheritDoc} */ public function addEventListener(string|array $events, object $listener): void { // Picks the hash code related to that listener - $hash = spl_object_hash($listener); + $oid = spl_object_id($listener); foreach ((array) $events as $event) { // Overrides listener if a previous one was associated already // Prevents duplicate listeners on same event (same instance only) - $this->listeners[$event][$hash] = $listener; + $this->listeners[$event][$oid] = $listener; } } - /** - * Removes an event listener from the specified events. - * - * @param string|string[] $events - */ + /** {@inheritDoc} */ public function removeEventListener(string|array $events, object $listener): void { // Picks the hash code related to that listener - $hash = spl_object_hash($listener); + $oid = spl_object_id($listener); foreach ((array) $events as $event) { - unset($this->listeners[$event][$hash]); + unset($this->listeners[$event][$oid]); } } - /** - * Adds an EventSubscriber. - * - * The subscriber is asked for all the events it is interested in and added - * as a listener for these events. - */ + /** {@inheritDoc} */ public function addEventSubscriber(EventSubscriber $subscriber): void { $this->addEventListener($subscriber->getSubscribedEvents(), $subscriber); } - /** - * Removes an EventSubscriber. - * - * The subscriber is asked for all the events it is interested in and removed - * as a listener for these events. - */ + /** {@inheritDoc} */ public function removeEventSubscriber(EventSubscriber $subscriber): void { $this->removeEventListener($subscriber->getSubscribedEvents(), $subscriber); diff --git a/doctrine/event-manager/src/EventManagerInterface.php b/doctrine/event-manager/src/EventManagerInterface.php new file mode 100644 index 000000000..82dd684b5 --- /dev/null +++ b/doctrine/event-manager/src/EventManagerInterface.php @@ -0,0 +1,13 @@ +