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

!!! TASK: Raise doctrine/dbal version constraint #5161

Merged
merged 9 commits into from
Jul 11, 2024

Conversation

kitsunet
Copy link
Member

@kitsunet kitsunet commented Jun 23, 2024

Neos adjustments for neos/flow-development-collection#2637
Related neos/eventstore-doctrineadapter#17

This may be breaking if you use the iteratable methods of the media Repositories, as those work slightly different now.
You can directly iterate the result of the query operation instead of going back to the iterate method.

@kitsunet
Copy link
Member Author

kitsunet commented Jun 28, 2024

This is technically ready but needs neos/flow-development-collection#2637 merged before it can work.

No longer because we have upmerged the double compat from 8.4

@mhsdesign
Copy link
Member

Added a commit that should be dropped later which should turn the CI green to see as a real e2e check if we missed something in flow.

@kitsunet kitsunet force-pushed the task/90-doctrine-dbal-update branch 2 times, most recently from 6b971c4 to 80d2b53 Compare July 1, 2024 11:11
@kitsunet kitsunet marked this pull request as ready for review July 1, 2024 11:23
@kitsunet
Copy link
Member Author

kitsunet commented Jul 1, 2024

I call this fine for now, see comments regarding the linting problem.

@kitsunet kitsunet force-pushed the task/90-doctrine-dbal-update branch from 80d2b53 to 9ace319 Compare July 1, 2024 12:03
Adjust to changes in DBAL API
@kitsunet kitsunet force-pushed the task/90-doctrine-dbal-update branch from 9ace319 to 7e7245d Compare July 1, 2024 12:14
Copy link
Member

@kdambekalns kdambekalns left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good by reading, and given the tests pass, this should be fine.

Just make sure to drop the CI hack before merge!

Copy link
Member

@mhsdesign mhsdesign left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried it out locally (by lazily creating a new core branch :D)
And Neos seems to boot up.
Also run the Neos Ui e2e tests and they pass.
Thank you for this <3

    "neos/neos-development-collection": "dev-task/temporary-core-branch-for-5161 as 9.0",
    "neos/flow-development-collection": "dev-dependabot/composer/doctrine/dbal-tw-3.2 as 9.0",

also we require https://github.com/neos/eventstore-doctrineadapter/releases/tag/2.0.0 and thus you have to remove "neos/eventstore-doctrineadapter": "^1" or raise it to 2 in your dev dist

The only thing i dindt test gotta be the new media module.

Also i have no idea how we deal with outdated import statements, ill push a commit to adjust use Doctrine\DBAL\DBALException but the scary thing is CI didnt catch it and i dont know if phpstan can.
edit: phpstan works in code that we check, but we dont check everything yet ^^

@mhsdesign mhsdesign force-pushed the task/90-doctrine-dbal-update branch from 7e7245d to d01548b Compare July 4, 2024 08:18
@kitsunet
Copy link
Member Author

kitsunet commented Jul 4, 2024

ähhh  @mhsdesign you forced pushed and it's broken now?

@mhsdesign
Copy link
Member

i dropped my CI hack commit as i think this is ready to merge

@kitsunet
Copy link
Member Author

kitsunet commented Jul 4, 2024

Right, flow too? then lets goooooo

@kitsunet
Copy link
Member Author

Alright, I would carefully say this is fine now, whatever might still need adapting can be done as a follow up.

@mhsdesign
Copy link
Member

Lol the total diff has become kinda unreviewable with all the casing changes 😅 DbalException -> DBALException etc ... but thanks for not force pushing and putting it nicely in separate commits ... i think i can +1 the additional changes as well ... though i have a question to findAllIterator see flow

@kitsunet
Copy link
Member Author

Well it's a PITA with that exception, I tried to just unify it to DBALException now, instead of doing it one by one because meh.

@kitsunet
Copy link
Member Author

I think nothing in here is raelly a big change apart from the iterable result thing in the media repos...

@kitsunet kitsunet changed the title TASK: Raise doctrine/dbal version constraint !!! TASK: Raise doctrine/dbal version constraint Jul 11, 2024
@kitsunet kitsunet merged commit 73fa331 into neos:9.0 Jul 11, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants