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

Add tests for ftp_rename #2879

Closed
wants to merge 2 commits into
base: master
from

Conversation

3 participants
@PHPGangsta

PHPGangsta commented Oct 26, 2017

No description provided.

@krakjoe

This comment has been minimized.

Show comment
Hide comment
@krakjoe

krakjoe Oct 27, 2017

Member

Please do not make test pull requests mixed with code changes.

Member

krakjoe commented Oct 27, 2017

Please do not make test pull requests mixed with code changes.

@PHPGangsta

This comment has been minimized.

Show comment
Hide comment
@PHPGangsta

PHPGangsta Oct 27, 2017

Hi,
it's just a unification of the indentation in that file. Some lines are not indented correctly if you view the file with 1tab=8spaces. There are no functional "code changes".
They are separate commits. Should I have done two separate PRs? Why is that important, do you want to merge only one of the two commits?
I have no clue how to split this PR into 2 PRs :-( Maybe you can pick/merge the commits one after the other?

PHPGangsta commented Oct 27, 2017

Hi,
it's just a unification of the indentation in that file. Some lines are not indented correctly if you view the file with 1tab=8spaces. There are no functional "code changes".
They are separate commits. Should I have done two separate PRs? Why is that important, do you want to merge only one of the two commits?
I have no clue how to split this PR into 2 PRs :-( Maybe you can pick/merge the commits one after the other?

@nikic

This comment has been minimized.

Show comment
Hide comment
@nikic

nikic Oct 28, 2017

Member

Merged 7d5bf6e and ba0ef91 into master, thanks :)

@PHPGangsta Yeah, this is fine as long as WS changes are in a separate commit. Unfortunately whitespace in test files are a bit of a mess, because there is no uniform standard.

Member

nikic commented Oct 28, 2017

Merged 7d5bf6e and ba0ef91 into master, thanks :)

@PHPGangsta Yeah, this is fine as long as WS changes are in a separate commit. Unfortunately whitespace in test files are a bit of a mess, because there is no uniform standard.

@nikic nikic closed this Oct 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment