-
Notifications
You must be signed in to change notification settings - Fork 94
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
Relocate files to remove redundant directories #288
Conversation
888f0c6
to
6ef55c7
Compare
bfd3324
to
9ff6a67
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@uuf6429 I rebased and force pushed this to resolve the conflict with #282 (as that PR still had the previous proposal for changing the composer.json autoload config).
The commits are still showing as yours but now showing a warning that they're unverified (as I obviously can't sign as you). Feel free to rebase and force push again to resolve that.
I have dropped the commit with the git-blame-ignore (the commit ref was outdated anyway) - AFAIK this is not actually required/appropriate for straight file moves, if you look at the blame on https://github.com/uuf6429/Gherkin/blame/chore/relocate-files/tests/ParserTest.php you'll see that it is correctly showing the history despite the file move.
I don't think that conflicts with other PRs will be an issue - the majority are old and have conflicts already anyway, and I've generally found git is usually quite reliable about resolving file renames so it should be quick enough to update anything that needs it.
9ff6a67
to
d7dc340
Compare
@acoulton done, thanks for taking the time to fix things. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great, thanks :-)
As expected, this needs to be updated to reflect the file having moved in Behat#288.
As expected, this needs to be updated to reflect the file having moved in Behat#288.
This PR does what was suggested here. I thought it would make sense / be cleaner to make a separate PR.
Changes:
./src
is now loaded as PSR-4./src
representsBehat\Gherkin\
./tests
representsTests\Behat\Gherkin\