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 9.0.x up into 10.0.x #271

Merged
merged 8 commits into from Jun 26, 2022
Merged

Merge 9.0.x up into 10.0.x #271

merged 8 commits into from Jun 26, 2022

Conversation

simPod
Copy link
Contributor

@simPod simPod commented Jun 26, 2022

@greg0ire How to process this properly? I'd need #269 to be include in 10.0.x branch.

simPod and others added 6 commits June 18, 2022 09:30
ci: run checks on php 8.0 and 8.1
We cannot run multiple update-compatibility-patch-* make targets at the same time so there's no need for having php version suffix in tmp-patch filename
chore(deps): require slevomat/coding-standard v8 and squizlabs/php_codesniffer v3.7
@greg0ire
Copy link
Member

What you did is correct, but you need to fix the build now.

@simPod simPod force-pushed the merge branch 11 times, most recently from 7093af8 to 995c202 Compare June 26, 2022 09:45
@simPod simPod marked this pull request as ready for review June 26, 2022 09:47
@simPod simPod requested a review from a team as a code owner June 26, 2022 09:47
ostrolucky
ostrolucky previously approved these changes Jun 26, 2022
malarzm
malarzm previously approved these changes Jun 26, 2022
@Ocramius
Copy link
Member

@simPod can you adjust the PR title to match meaning? For release notes

@simPod simPod changed the title Merge Merge 10.0.x down into 9.0.x Jun 26, 2022
@simPod
Copy link
Contributor Author

simPod commented Jun 26, 2022

@Ocramius what about now

@Ocramius
Copy link
Member

Ok, then it seems wrong to do this :D

@simPod simPod changed the title Merge 10.0.x down into 9.0.x Merge 9.0.x up into 10.0.x Jun 26, 2022
@simPod
Copy link
Contributor Author

simPod commented Jun 26, 2022

lol I messed up. Now it's correct.

Ocramius
Ocramius previously approved these changes Jun 26, 2022
Makefile Show resolved Hide resolved
# Conflicts:
#	Makefile
#	tests/php74-compatibility.patch
#	tests/php80-compatibility.patch
@malarzm malarzm merged commit 0f64bb0 into doctrine:10.0.x Jun 26, 2022
@malarzm
Copy link
Member

malarzm commented Jun 26, 2022

Thanks @simPod!

@simPod simPod deleted the merge branch June 26, 2022 21:07
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.

None yet

6 participants