Review main Merged

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

Stefan Bürk CR +2 V +2 Easy +15 −3 updated 07/16/22, 19:48

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
    • Stefan Bürk +2
    • Oliver Klee +1
    • Christian Kuhn +1
  • Verified V +2 Done
    • Stefan Bürk +2
    • Oliver Klee +1
    • Christian Kuhn +1
    • core-ci +1 CI

Issues 3

Files 2

Review log 811

  1. Stefan Bürk uploaded patch set 1 07/16/22, 19:00

  2. core-ci voted on patch set 1 V +1 07/16/22, 19:08 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/29292

  3. Stefan Bürk updated the commit message in patch set 2 07/16/22, 19:09

  4. core-ci voted on patch set 2 V +1 07/16/22, 19:16 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/29293

  5. Christian Kuhn uploaded patch set 3 07/16/22, 19:33

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

  7. core-ci voted on patch set 3 V +1 07/16/22, 19:40 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/29294

  8. Oliver Klee voted on patch set 3 CR +1 07/16/22, 19:44

  9. Oliver Klee voted on patch set 3 V +1 07/16/22, 19:48

  10. Stefan Bürk voted on patch set 3 V +2 CR +2 07/16/22, 19:48

  11. Stefan Bürk merged patch set 4 07/16/22, 19:48