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

Fix some typos #7320

Merged
merged 1 commit into from
Jul 31, 2021
Merged

Fix some typos #7320

merged 1 commit into from
Jul 31, 2021

Conversation

javiereguiluz
Copy link
Contributor

No description provided.

@kamil-tekiela
Copy link
Member

kamil-tekiela commented Jul 30, 2021

Thank you, but I'm not sure what sense is there in fixing typos in PHP 7.4. This is not a bug fix in any way. Merging this could prove cumbersome. Why not fix typos on Master?

@javiereguiluz
Copy link
Contributor Author

Sorry about that! I followed the practices stablished in the Symfony project: submit fixes to the oldest maintained branch to merge them there and in all the upper supported branches (PHP-8.0, master, etc.)

I don't know which are the practices followed in this repository. Should I rebase to master? PHP-8.0? Thanks!

@kocsismate
Copy link
Member

kocsismate commented Jul 30, 2021

I don't know which are the practices followed in this repository. Should I rebase to master? PHP-8.0? Thanks!

Please use the master branch for any changes which are not necessary to backport to older branches. Fixing typos is generally this kind of change :)

@kamil-tekiela
Copy link
Member

If it's a security issue, do N-3 versions.
If it's a bug fix, do N-2 versions.
For everything else, make changes on master.

@javiereguiluz javiereguiluz changed the base branch from PHP-7.4 to master July 30, 2021 13:50
@javiereguiluz
Copy link
Contributor Author

Thanks for your help! It was very useful 👍

I've just rebased to master.

@krakjoe krakjoe merged commit ffc8717 into php:master Jul 31, 2021
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

4 participants