Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge: 8.3 to 9.0 and fix DBAL compatibility issues #5176

Merged
merged 55 commits into from
Jul 6, 2024

Conversation

kitsunet
Copy link
Member

@kitsunet kitsunet commented Jul 5, 2024

Upmerge 8.4 > 9.0 and then fix everything necessary to make it work with DBAL 3.
Not deprecation cleanup, just necessary changes to make it work.
A follow up will change this to be DBAL 3 only and remove deprecations.

bwaidelich and others added 30 commits April 25, 2024 17:20
Re-establishes the Neos < 8.0 behavior of removed/nulled data structure keys

With #3645 a lot of Fusion core logic was refactored.
As an unwanted side-effect, `Neos.Fusion:DataStructure` prototypes (effectively all implementations of the `AbstractArrayFusionObject`) now behave differently when it comes to removed or nulled keys and

```fusion
Neos.Fusion:DataStructure {
    someProperty >
}
```

led to an array with:

```json
{"someProperty":[]}
```

in Neos 8.0+.

This fix reverts this side-effect, making the above return

```json
[]
```

again.

Fixes: #3859
Related: #3577, #3646
Re-establishes the Neos < 8.0 behavior of removed/nulled data structure keys

## Background:

With #3645 a lot of Fusion core logic was refactored. As an unwanted side-effect, `Neos.Fusion:DataStructure` prototypes (effectively all implementations of the `AbstractArrayFusionObject`) now behave differently when it comes to removed or nulled keys and

```fusion
Neos.Fusion:DataStructure {
    someProperty >
}
```

led to an array with:

```json
{"someProperty":[]}
```

in Neos 8.0+.

This fix reverts this side-effect, making the above return

```json
[]
```

again.

Fixes: #3859
Related: #3577, #3646
Currently translated at 100.0% (143 of 143 strings)

Translation: Neos/Neos.Media.Browser - Main - 8.3
Translate-URL: https://hosted.weblate.org/projects/neos/neos-media-browser-main-8-3/nl/
BUGFIX: Fix handling of unset/nulled DataStructure keys
BUGFIX: Workspace module: Tweak UX for collapsed rows in rewiew
The title text of impersonate button and restore button was always in english.
Issue #4511
Currently translated at 100.0% (280 of 280 strings)

Translation: Neos/Neos.Neos- Main - 8.3
Translate-URL: https://hosted.weblate.org/projects/neos/neos-neos-main-8-3/de/
Currently translated at 100.0% (143 of 143 strings)

Translation: Neos/Neos.Media.Browser - Main - 8.3
Translate-URL: https://hosted.weblate.org/projects/neos/neos-media-browser-main-8-3/de/
Currently translated at 100.0% (323 of 323 strings)

Translation: Neos/Neos.Neos - Modules - 8.3
Translate-URL: https://hosted.weblate.org/projects/neos/neos-neos-modules-8-3/de/
Currently translated at 95.3% (267 of 280 strings)

Translation: Neos/Neos.Neos- Main - 8.3
Translate-URL: https://hosted.weblate.org/projects/neos/neos-neos-main-8-3/fr/
In the default configuration this links to the content module,
or to their user settings if they don’t have access to
the content module.

Resolves: #4799
…or-impersonate-button-in-user-management

BUGFIX: Fix title attribute for impersonate button in user management
alexandergirod and others added 14 commits June 7, 2024 19:48
Currently translated at 100.0% (143 of 143 strings)

TASK: Translated using Weblate (German)

Currently translated at 100.0% (324 of 324 strings)

TASK: Translated using Weblate (German)

Currently translated at 100.0% (4 of 4 strings)

TASK: Translated using Weblate (German)

Currently translated at 100.0% (4 of 4 strings)

Co-authored-by: Alexander Girod <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/neos/neosmediabrowser-main-84/de/
Translate-URL: https://hosted.weblate.org/projects/neos/neosneos-modules-84/de/
Translate-URL: https://hosted.weblate.org/projects/neos/neosneos-nodetypespluginview-84/de/
Translate-URL: https://hosted.weblate.org/projects/neos/neosnodetypesassetlist-nodetypesassetlist-84/de/
Translation: Neos/Neos.Media.Browser - Main - 8.4
Translation: Neos/Neos.Neos - Modules - 8.4
Translation: Neos/Neos.Neos - NodeTypes/PluginView - 8.4
Translation: Neos/Neos.NodeTypes.AssetList - NodeTypes/AssetList - 8.4
TASK: Update textarea docs to latest version
…lity-8.4

FEATURE: Support doctrine/dbal 2.x and 3.x
@github-actions github-actions bot added the 9.0 label Jul 5, 2024
@kitsunet
Copy link
Member Author

kitsunet commented Jul 5, 2024

This is just the upmerge with hopefully correctly fixed conflicts, will fail at the moment.

@kitsunet
Copy link
Member Author

kitsunet commented Jul 5, 2024

I do not undestand why phpstan on CI shows different things than local

@kitsunet kitsunet marked this pull request as ready for review July 6, 2024 10:16
@kitsunet
Copy link
Member Author

kitsunet commented Jul 6, 2024

I would merge this later if CI is green as upmerge & necessary followup. I tried to touch nothing that doesn't need to be touched.
If someone take a look that's fine too.

@kitsunet kitsunet enabled auto-merge July 6, 2024 10:37
@kitsunet kitsunet disabled auto-merge July 6, 2024 10:37
@kitsunet kitsunet merged commit ac13630 into 9.0 Jul 6, 2024
11 checks passed
@kitsunet kitsunet deleted the task/merge-dbal-compat branch July 6, 2024 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants