Review 11.5 Merged

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

Christian Kuhn CR +2 V +2 Easy +15 −3 updated 07/16/22, 19:56

Commit message

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.

Review

  • Code review CR +2 Done
    • Christian Kuhn +2
  • Verified V +2 Done
    • Christian Kuhn +2
    • core-ci +1 CI

Issues 3

Files 2

Review log 34

  1. Christian Kuhn commented on patch set 1 07/16/22, 19:48

    Cherry Picked from branch main.
  2. core-ci voted on patch set 1 V +1 07/16/22, 19:56 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/29295

  3. Christian Kuhn voted on patch set 1 V +2 CR +2 07/16/22, 19:56

  4. Christian Kuhn merged patch set 2 07/16/22, 19:56