Commit 79f30d1
[TASK] Adjust
With `doctrine/dbal 4.2.0` the `enum` has been added directly
in DBAL, implementing it slightly different than the original
TYPO3 implementation, which has been mitigated with #105279
and adopted for the `set` type in advance with #105294.
TYPO3 still needs to adopt the options reading existing database
schema provided by a trait to the extended platform classes and
missed to pass the `enum` and `set` option values as `values` to
the `Column` objects instead as `platformOption` key, hidden by
the fact that getting the array representation of a column merges
the platformOptions on the same level with the direct value options.
Upcoming `doctrine/dbal` introduces more phpdoc-block array shapes,
narrowing down possible (allowed) array keys for `platformOptions`
and failing with phpstan in core tests while not beeing a technical
issue.
This change adjusts related code within the `ext_tables.sql` related
`TableBuilder` and the platform trait reading the values and setting
it to `Column` objects as value property instead of `platformOption`.
Considered as task and not as bugfix due to the fact that this is
only static code analysis related and not technically breaking.
Minor left-over in the `SetType` implementation for `doctrine/dbal 4.0`
is removed along the way.
Tested and extracted from doctrine/dbal 4.3.x test,
see: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88596
[1] doctrine/dbal#6536
[2] https://github.com/doctrine/dbal/releases/tag/4.2.0
Resolves: #106486
Related: #105294
Related: #105279
Releases: main, 13.4
Change-Id: Ib40d8d684fdce840e4050387416227d56e39698b
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88905
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Garvin Hicking <gh@faktor-e.de>
Tested-by: Garvin Hicking <gh@faktor-e.de>
Tested-by: Georg Ringer <georg.ringer@gmail.com>EnumType and SetType type schema handling1 parent e191599 commit 79f30d1
File tree
6 files changed
+15
-25
lines changed- typo3/sysext/core
- Classes/Database/Schema
- Parser
- SchemaManager
- Types
- Tests/Unit/Database/Schema/SchemaManager
6 files changed
+15
-25
lines changedLines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
179 | 179 | | |
180 | 180 | | |
181 | 181 | | |
182 | | - | |
| 182 | + | |
183 | 183 | | |
184 | 184 | | |
185 | | - | |
| 185 | + | |
186 | 186 | | |
187 | 187 | | |
188 | 188 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
87 | | - | |
| 87 | + | |
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
| |||
Lines changed: 0 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | 51 | | |
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
| 81 | + | |
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
85 | | - | |
| 85 | + | |
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| |||
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
106 | | - | |
| 106 | + | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | | - | |
| 110 | + | |
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| |||
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
| 62 | + | |
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
| 66 | + | |
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| |||
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
87 | | - | |
| 87 | + | |
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
| 91 | + | |
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
| |||
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
| 83 | + | |
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
87 | | - | |
| 87 | + | |
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
| |||
0 commit comments