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

Still works on PHP 7.1 #226

Merged
merged 2 commits into from
Oct 25, 2020
Merged

Still works on PHP 7.1 #226

merged 2 commits into from
Oct 25, 2020

Conversation

beberlei
Copy link
Member

@beberlei beberlei commented Oct 24, 2020

Restricting the 8.1 branch to 7.1 is an artificial constraint, the code works on 7.1 just fine.

#127 removed 7.1 support, but slevomat/coding-standard reintroduced 7.1 support with slevomat/coding-standard@b26cb5c#diff-d2ab9925cad7eac58e0ff4cc0d251a937ecf49e4b6bf57f8b95aab76648a9d34

malarzm
malarzm previously approved these changes Oct 24, 2020
Copy link
Member

@greg0ire greg0ire left a comment

Choose a reason for hiding this comment

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

Should 7.1 be added to

php-version:
- "7.2"
- "7.3"
- "7.4"

?

Should this be changed to 7.1?

@beberlei
Copy link
Member Author

@greg0ire yes to both, added and works.

@greg0ire
Copy link
Member

greg0ire commented Oct 24, 2020

Note to the person that merges this: you will have to mark "Test fixes (7.2)" as no longer required, and the new 7.1 jobs as required in the settings just before merging this.

@greg0ire greg0ire merged commit 3cf6e3d into doctrine:8.1.x Oct 25, 2020
@greg0ire
Copy link
Member

Thanks @beberlei !

@greg0ire
Copy link
Member

Ah crap, this shouldn't have been merged in 8.1.x, it's not a bugfix… Also, master is aliased to 7.0.x 🤦
Let me figure out if master has any BC-breaking changes and I will figure out what to do from there.

@beberlei
Copy link
Member Author

@greg0ire you could argue its a bugfix, as 7.1 support was wrongly removed :-)

@greg0ire
Copy link
Member

Yeah sure. I think there are no BC-breaks on master. Also, master has f6d859e , which I believe would have also solved the CI issue we had 😆 . I will merge 8.1x into master, then rename master to 8.2.x, and then we can release 8.2.0

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.

4 participants