EP/myep-team
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix deprecations after bumping doctrine

Browse Source
This commit is contained in:
fromme
2026-09-01 15:46:14 +02:00
parent 10ab2bd04b
commit df1e38b008
3 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+39 -46
View File
@@ -70,26 +70,26 @@
}, },
{ {
"name": "carbonphp/carbon-doctrine-types", "name": "carbonphp/carbon-doctrine-types",
"version": "2.1.0", "version": "3.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/CarbonPHP/carbon-doctrine-types.git", "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
"reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb" "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb", "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
"reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb", "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.4 || ^8.0" "php": "^8.1"
}, },
"conflict": { "conflict": {
"doctrine/dbal": "<3.7.0 || >=4.0.0" "doctrine/dbal": "<4.0.0 || >=5.0.0"
}, },
"require-dev": { "require-dev": {
"doctrine/dbal": "^3.7.0", "doctrine/dbal": "^4.0.0",
"nesbot/carbon": "^2.71.0 || ^3.0.0", "nesbot/carbon": "^2.71.0 || ^3.0.0",
"phpunit/phpunit": "^10.3" "phpunit/phpunit": "^10.3"
}, },
@@ -119,7 +119,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues", "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
"source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0" "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"
}, },
"funding": [ "funding": [
{ {
@@ -135,7 +135,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-12-11T17:09:12+00:00" "time": "2024-02-09T16:56:22+00:00"
}, },
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
@@ -448,48 +448,40 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "3.10.6", "version": "4.4.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "c95589d775a0b2e543467d40f8c3ecccf586f2b4" "reference": "fb9e0ffe15e1590e24dc61c0c0a23f9a33ee42ce"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/c95589d775a0b2e543467d40f8c3ecccf586f2b4", "url": "https://api.github.com/repos/doctrine/dbal/zipball/fb9e0ffe15e1590e24dc61c0c0a23f9a33ee42ce",
"reference": "c95589d775a0b2e543467d40f8c3ecccf586f2b4", "reference": "fb9e0ffe15e1590e24dc61c0c0a23f9a33ee42ce",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer-runtime-api": "^2", "doctrine/deprecations": "^1.1.5",
"doctrine/deprecations": "^0.5.3|^1", "php": "^8.2",
"doctrine/event-manager": "^1|^2",
"php": "^7.4 || ^8.0",
"psr/cache": "^1|^2|^3", "psr/cache": "^1|^2|^3",
"psr/log": "^1|^2|^3" "psr/log": "^1|^2|^3"
}, },
"conflict": {
"doctrine/cache": "< 1.11"
},
"require-dev": { "require-dev": {
"doctrine/cache": "^1.11|^2.0",
"doctrine/coding-standard": "14.0.0", "doctrine/coding-standard": "14.0.0",
"fig/log-test": "^1", "fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.1", "jetbrains/phpstorm-stubs": "2023.2",
"phpstan/phpstan": "2.1.30", "phpstan/phpstan": "2.1.30",
"phpstan/phpstan-phpunit": "2.0.7",
"phpstan/phpstan-strict-rules": "^2", "phpstan/phpstan-strict-rules": "^2",
"phpunit/phpunit": "9.6.34", "phpunit/phpunit": "11.5.50",
"slevomat/coding-standard": "8.27.1", "slevomat/coding-standard": "8.27.1",
"squizlabs/php_codesniffer": "4.0.1", "squizlabs/php_codesniffer": "4.0.1",
"symfony/cache": "^5.4|^6.0|^7.0|^8.0", "symfony/cache": "^6.3.8|^7.0|^8.0",
"symfony/console": "^4.4|^5.4|^6.0|^7.0|^8.0" "symfony/console": "^5.4|^6.3|^7.0|^8.0"
}, },
"suggest": { "suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files." "symfony/console": "For helpful console commands such as SQL execution and import of files."
}, },
"bin": [
"bin/doctrine-dbal"
],
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@@ -542,7 +534,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.10.6" "source": "https://github.com/doctrine/dbal/tree/4.4.4"
}, },
"funding": [ "funding": [
{ {
@@ -558,7 +550,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2026-07-21T12:57:49+00:00" "time": "2026-07-21T14:34:40+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
@@ -2152,39 +2144,40 @@
}, },
{ {
"name": "knplabs/knp-components", "name": "knplabs/knp-components",
"version": "v5.2.0", "version": "v5.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/KnpLabs/knp-components.git", "url": "https://github.com/KnpLabs/knp-components.git",
"reference": "eabf39263fff305c0024820c3736e5b03e7edf50" "reference": "1c69651056fea716f5f6c60e11c59cabf6c1bf54"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/KnpLabs/knp-components/zipball/eabf39263fff305c0024820c3736e5b03e7edf50", "url": "https://api.github.com/repos/KnpLabs/knp-components/zipball/1c69651056fea716f5f6c60e11c59cabf6c1bf54",
"reference": "eabf39263fff305c0024820c3736e5b03e7edf50", "reference": "1c69651056fea716f5f6c60e11c59cabf6c1bf54",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^8.1", "php": "^8.2",
"symfony/event-dispatcher-contracts": "^3.0" "symfony/event-dispatcher-contracts": "^3.0"
}, },
"conflict": { "conflict": {
"doctrine/dbal": "<3.8" "doctrine/dbal": "<4.0"
}, },
"require-dev": { "require-dev": {
"doctrine/dbal": "^3.8 || ^4.0", "doctrine/dbal": "^4.0",
"doctrine/mongodb-odm": "^2.5.5", "doctrine/mongodb-odm": "^2.5.5",
"doctrine/orm": "^2.13 || ^3.0", "doctrine/orm": "^3.0",
"doctrine/phpcr-odm": "^1.8 || ^2.0", "doctrine/phpcr-odm": "^2.0",
"ext-pdo_sqlite": "*", "ext-pdo_sqlite": "*",
"jackalope/jackalope-doctrine-dbal": "^1.12 || ^2.0", "jackalope/jackalope-doctrine-dbal": "^2.0",
"phpunit/phpunit": "^10.5 || ^11.3", "phpunit/phpunit": "^11.5 || ^12.5 || ^13.2",
"propel/propel1": "^1.7", "propel/propel1": "^1.7",
"ruflin/elastica": "^7.0", "ruflin/elastica": "^7.0",
"solarium/solarium": "^6.0", "solarium/solarium": "^6.0",
"symfony/http-foundation": "^5.4.38 || ^6.4.4 || ^7.0", "symfony/http-foundation": "^6.4.4 || ^7.4",
"symfony/http-kernel": "^5.4.38 || ^6.4.4 || ^7.0", "symfony/http-kernel": "^6.4.4 || ^7.4",
"symfony/property-access": "^5.4.38 || ^6.4.4 || ^7.0" "symfony/property-access": "^6.4.4 || ^7.4",
"symfony/var-exporter": "^6.4.4 || ^7.4"
}, },
"suggest": { "suggest": {
"doctrine/common": "to allow usage pagination with Doctrine ArrayCollection", "doctrine/common": "to allow usage pagination with Doctrine ArrayCollection",
@@ -2233,9 +2226,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/KnpLabs/knp-components/issues", "issues": "https://github.com/KnpLabs/knp-components/issues",
"source": "https://github.com/KnpLabs/knp-components/tree/v5.2.0" "source": "https://github.com/KnpLabs/knp-components/tree/v5.3.0"
}, },
"time": "2025-03-20T07:35:37+00:00" "time": "2026-08-07T07:05:10+00:00"
}, },
{ {
"name": "knplabs/knp-menu", "name": "knplabs/knp-menu",
config/packages/web_profiler.yaml
+2 -1
View File
@@ -14,4 +14,5 @@ when@test:
intercept_redirects: false intercept_redirects: false
framework: framework:
profiler: { collect: false } profiler:
collect_serializer_data: true
tests/Service/Statistics/StatisticsRecorderTest.php
+2 -2
View File
@@ -11,7 +11,7 @@ use App\Enum\StatisticsActorRole;
use App\Enum\StatisticsEventName; use App\Enum\StatisticsEventName;
use App\Service\Statistics\StatisticsRecorder; use App\Service\Statistics\StatisticsRecorder;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Exception as DbalException; use Doctrine\DBAL\Exception\DatabaseRequired;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
@@ -103,7 +103,7 @@ class StatisticsRecorderTest extends TestCase
{ {
$this->connection $this->connection
->method('insert') ->method('insert')
->willThrowException(new DbalException('no such table')) ->willThrowException(new DatabaseRequired('no such table'))
; ;
$this->logger->expects($this->once())->method('error'); $this->logger->expects($this->once())->method('error');