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

Relocate files to remove redundant directories #288

Merged
merged 2 commits into from
Feb 22, 2025

Conversation

uuf6429
Copy link
Contributor

@uuf6429 uuf6429 commented Feb 19, 2025

This PR does what was suggested here. I thought it would make sense / be cleaner to make a separate PR.

Changes:

  1. ./src is now loaded as PSR-4
  2. ./src represents Behat\Gherkin\
  3. ./tests represents Tests\Behat\Gherkin\
  4. fixed namespace of existing test

⚠️ I've added a git-ignore-blame entry, so this PR should not be squashed when accepted.

@uuf6429 uuf6429 force-pushed the chore/relocate-files branch from 888f0c6 to 6ef55c7 Compare February 19, 2025 21:37
@acoulton acoulton force-pushed the chore/relocate-files branch from bfd3324 to 9ff6a67 Compare February 19, 2025 23:48
Copy link
Contributor

@acoulton acoulton left a 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.

@uuf6429 uuf6429 force-pushed the chore/relocate-files branch from 9ff6a67 to d7dc340 Compare February 20, 2025 18:48
@uuf6429
Copy link
Contributor Author

uuf6429 commented Feb 20, 2025

@acoulton done, thanks for taking the time to fix things.

Copy link
Contributor

@acoulton acoulton left a comment

Choose a reason for hiding this comment

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

Great, thanks :-)

@acoulton acoulton merged commit 5edc2f5 into Behat:master Feb 22, 2025
8 checks passed
@uuf6429 uuf6429 deleted the chore/relocate-files branch February 23, 2025 00:34
acoulton added a commit to acoulton/Gherkin that referenced this pull request Feb 26, 2025
As expected, this needs to be updated to reflect the file having
moved in Behat#288.
acoulton added a commit to acoulton/Gherkin that referenced this pull request Feb 26, 2025
As expected, this needs to be updated to reflect the file having
moved in Behat#288.
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.

3 participants