Skip to content

Commit

Permalink
[TASK] Update Doctrine DBAL
Browse files Browse the repository at this point in the history
This update fixes some PHPStan warnings for us.

> composer req doctrine/dbal:^3.6.2
> composer req doctrine/dbal:^3.6.2 --no-update -d typo3/sysext/core
> composer req doctrine/dbal:^3.6.2 --no-update -d typo3/sysext/install
> composer req doctrine/dbal:^3.6.2 --no-update -d \
  typo3/sysext/redirects
> ./Build/Scripts/runTests.sh -s phpstanGenerateBaseline

Resolves: #100602
Releases: main
Change-Id: I41832c6615e944933bdbd23f447df4a84651ed84
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78644
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
  • Loading branch information
oliverklee authored and lolli42 committed Apr 14, 2023
1 parent be38ba0 commit fff1abc
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 23 deletions.
10 changes: 0 additions & 10 deletions Build/phpstan/phpstan-baseline.neon
Expand Up @@ -550,16 +550,6 @@ parameters:
count: 1
path: ../../typo3/sysext/core/Classes/Database/Connection.php

-
message: "#^Offset 'persistent' on array\\{charset\\?\\: string, dbname\\?\\: string, defaultTableOptions\\?\\: array\\<string, mixed\\>, default_dbname\\?\\: string, driver\\?\\: 'ibm_db2'\\|'mysqli'\\|'oci8'\\|'pdo_mysql'\\|'pdo_oci'\\|'pdo_pgsql'\\|'pdo_sqlite'\\|'pdo_sqlsrv'\\|'pgsql'\\|'sqlite3'\\|'sqlsrv', driverClass\\?\\: class\\-string\\<Doctrine\\\\DBAL\\\\Driver\\>, driverOptions\\?\\: array, host\\?\\: string, \\.\\.\\.\\} in empty\\(\\) does not exist\\.$#"
count: 1
path: ../../typo3/sysext/core/Classes/Database/Driver/PDOMySql/Driver.php

-
message: "#^Offset 'persistent' on array\\{charset\\?\\: string, dbname\\?\\: string, defaultTableOptions\\?\\: array\\<string, mixed\\>, default_dbname\\?\\: string, driver\\?\\: 'ibm_db2'\\|'mysqli'\\|'oci8'\\|'pdo_mysql'\\|'pdo_oci'\\|'pdo_pgsql'\\|'pdo_sqlite'\\|'pdo_sqlsrv'\\|'pgsql'\\|'sqlite3'\\|'sqlsrv', driverClass\\?\\: class\\-string\\<Doctrine\\\\DBAL\\\\Driver\\>, driverOptions\\?\\: array, host\\?\\: string, \\.\\.\\.\\} in empty\\(\\) does not exist\\.$#"
count: 1
path: ../../typo3/sysext/core/Classes/Database/Driver/PDOPgSql/Driver.php

-
message: "#^Parameter \\#4 \\$condition of method Doctrine\\\\DBAL\\\\Query\\\\QueryBuilder\\:\\:leftJoin\\(\\) expects string\\|null, TYPO3\\\\CMS\\\\Core\\\\Database\\\\Query\\\\Expression\\\\CompositeExpression given\\.$#"
count: 1
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -51,7 +51,7 @@
"bacon/bacon-qr-code": "^2.0.7",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.13.3 || ^2.0",
"doctrine/dbal": "^3.6.0",
"doctrine/dbal": "^3.6.2",
"doctrine/event-manager": "^2.0",
"doctrine/instantiator": "^2.0",
"doctrine/lexer": "^2.0 || ^3.0",
Expand Down
18 changes: 9 additions & 9 deletions composer.lock

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

2 changes: 1 addition & 1 deletion typo3/sysext/core/composer.json
Expand Up @@ -34,7 +34,7 @@
"bacon/bacon-qr-code": "^2.0.7",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.13.3 || ^2.0",
"doctrine/dbal": "^3.6.0",
"doctrine/dbal": "^3.6.2",
"doctrine/event-manager": "^2.0",
"doctrine/lexer": "^2.0 || ^3.0",
"egulias/email-validator": "^4.0",
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/install/composer.json
Expand Up @@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
"doctrine/dbal": "^3.6.0",
"doctrine/dbal": "^3.6.2",
"guzzlehttp/promises": "^1.5.2",
"nikic/php-parser": "^4.15.1",
"symfony/finder": "^6.2",
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/redirects/composer.json
Expand Up @@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
"doctrine/dbal": "^3.6.0",
"doctrine/dbal": "^3.6.2",
"psr/http-message": "^1.0",
"psr/log": "^2.0 || ^3.0",
"symfony/console": "^6.2",
Expand Down

0 comments on commit fff1abc

Please sign in to comment.