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 PHPUnit version to 9 #3233

Merged
merged 1 commit into from Dec 8, 2020
Merged

TASK: Raise PHPUnit version to 9 #3233

merged 1 commit into from Dec 8, 2020

Conversation

albe
Copy link
Member

@albe albe commented Dec 8, 2020

No description provided.

@albe
Copy link
Member Author

albe commented Dec 8, 2020

🤞 that builds run through (or at least pass installation)

@albe
Copy link
Member Author

albe commented Dec 8, 2020

OK, but incomplete, skipped, or risky tests!
Tests: 5805, Assertions: 10751, Skipped: 65, Incomplete: 1.

🎉

Just now realized that #3229 should have solved that already, but did not end up in the 7.0 branch. So we actually need to backport that It did end up in 7.0, just the composer merger overwrote the collection phpunit version

@bwaidelich
Copy link
Member

@albe thanks for taking care

Just now realized that #3229 should have solved that already, but did not end up in the 7.0 branch

Yep, I realized that yesterday as well: https://neos-project.slack.com/archives/C12EZDXA8/p1607365582260300

But @kdambekalns wrote

Fixed that by merging back and forth…

@albe
Copy link
Member Author

albe commented Dec 8, 2020

Yeah. All is well with this now (and #3232 will prevent the composer merger from overwriting this again). Tests also green :)

@albe albe merged commit 45a351c into 7.0 Dec 8, 2020
@albe albe deleted the albe-phpunit9 branch December 8, 2020 08:09
@kdambekalns
Copy link
Member

But @kdambekalns wrote

Fixed that by merging back and forth…

Ah, then I misunderstood what you meant! The merge of the PR related to PhpUnit was fine, there was nothing to fix… the dependency was broken "afterwards in secrecy" by the branching…

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants