Skip to content
Commit 5ff2f02d authored by Stefan Bürk's avatar Stefan Bürk
Browse files

[BUGFIX] Transform `tableoptions` early to valid `doctrine/dbal` option

With #80398 support to set `tableoptions` to proper charset and
collate has been added. This setting has been passed through the
`doctrine/dbal` connection params and manually set to the schema
config for database compare, if it has been set.

The choosen key `tableoptions` however is not a valid key for
`doctrine/dbal` connection params. `doctrine/dbal` ships proper
PHPStan/Psalm type definitions for the param array now, and
mumbles about this key.

This patch transform the `tableoptions` to the proper `doctrine/dbal`
`defaultTableOptions` in the `ConnectionPool`, only transporting the
valid params with the connection. Places which handled the invalid
`tableoptions` are changed to use `defaultTableOptions` instead.

This prepares the ability to raise `doctrine/dbal` dependencies and
phpstan with #97956.

Full migration with configuration cleanup may be done in a dedicated
patch with proper documentation of that change in v12 only.

Resolves: #97961
Related: #80398
Related: #97956
Releases: main, 11.5
Change-Id: I33ddc1ae1bebb77e5d64d17e5fbc19eb0e2dc495
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75211


Tested-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: default avatarcore-ci <typo3@b13.com>
Tested-by: default avatarOliver Klee <typo3-coding@oliverklee.de>
Tested-by: default avatarStefan Bürk <stefan@buerk.tech>
Reviewed-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: default avatarOliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: default avatarStefan Bürk <stefan@buerk.tech>
parent a2d5611f
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment