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

Fixes descending order on IfToSpaceship #2097

Merged

Conversation

peterlupu
Copy link
Contributor

@peterlupu peterlupu commented Apr 19, 2022

Should fix #7118.

Please code review this, as I think I found errors in the existing unit tests.

Also, I had to jump through some hoops in order to please phpstan's cognitive complexity calculator.

@samsonasik
Copy link
Member

could you rebase and amend commit with remove 'quote' in commit message? - it may make build stopped when merged

@peterlupu
Copy link
Contributor Author

peterlupu commented Apr 19, 2022

could you rebase and amend commit with remove 'quote' in commit message? - it may make build stopped when merged

hi

sorry if this is offtopic but can't seem to be able to do this. a little help, please?

$ git checkout b3dda553a1f21c9b14c15b79a90b0fbb503eb3f1
$ git commit -m 'merge branch' --amend
$ git checkout -
$ git rebase ced947f001
$ git push

@samsonasik
Copy link
Member

samsonasik commented Apr 19, 2022

You should can do:

#ensure base branch is PR branch
git checkout test/IfToSpaceshipRector-asc-desc 

# create a branch for backup
git checkout -b temp 

# back to branch PR
git checkout test/IfToSpaceshipRector-asc-desc 

git reset --hard HEAD~10 

git remote add upstream https://github.com/rectorphp/rector-src 

git pull upstream main
git cherry-pick 59bde137c23dbba32eaeb7df8d94e570aeff6996 

git push --force origin test/IfToSpaceshipRector-asc-desc

@peterlupu peterlupu force-pushed the test/IfToSpaceshipRector-asc-desc branch from ed4809c to 02d2f7b Compare April 19, 2022 21:19
@peterlupu
Copy link
Contributor Author

You should can do:

#ensure base branch is PR branch
git checkout test/IfToSpaceshipRector-asc-desc 

# create a branch for backup
git checkout -b temp 

# back to branch PR
git checkout test/IfToSpaceshipRector-asc-desc 

git reset --hard HEAD~10 

git remote add upstream https://github.com/rectorphp/rector-src 

git pull upstream main
git cherry-pick 59bde137c23dbba32eaeb7df8d94e570aeff6996 

git push --force origin test/IfToSpaceshipRector-asc-desc

I think I managed to remove the quotes, thanks to you. 🎉

@samsonasik samsonasik merged commit b92465d into rectorphp:main Apr 19, 2022
@samsonasik
Copy link
Member

Thank you @peterlupu

@peterlupu peterlupu deleted the test/IfToSpaceshipRector-asc-desc branch April 19, 2022 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants