-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
Lost commits during merge? #24487
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
Comments
Might be a bad merge conflict resolution. Would you mind sending a fix with a test case please? |
Test case for request:
Not sure only due
but seems that works without it also |
Could you please send a pull request with the following changes ? |
fabpot
added a commit
that referenced
this issue
Oct 16, 2017
…h a question mark. (syzygymsu) This PR was merged into the 3.3 branch. Discussion ---------- [3.3] Fixed pathinfo calculation for requests starting with a question mark. | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24487 | License | MIT | Doc PR | no Fix of bad merge conflict resolving as mentioned in #24487. Port #21968 to 3.3+ Commits ------- c17a922 Fixed pathinfo calculation for requests starting with a question mark. - fix bad conflict resolving issue - port #21968 to 3.3+
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I've just updated
symfony/http-foundation
dependency from 3.2.8 to 3.3.10, and tests at random place just broke, previously was working with expectation of'http://localhost/test'
, now it became'http://localhosttest'
. I'm using getUri method.I made some research, so I updated to 3.2.13 (seems working version). then I updated to 3.3.0 version (broke), and tried to find in history who deleted
'/'
, but nothing interested found, just addition, but not removal, at commit symfony/http-foundation@9077baf#diff-7edb274bc39ed8c493badba7dd278826I'm using
getUri
method, which uses that discussedpreparePathInfo
method. More over I found another missing slashes commits:symfony/http-foundation@9077baf#diff-7edb274bc39ed8c493badba7dd278826
symfony/http-foundation@4665cb9#diff-7edb274bc39ed8c493badba7dd278826
symfony/http-foundation@742db41#diff-7edb274bc39ed8c493badba7dd278826L1849
Please clearify is it missing or deleted for real but no reference to it?
The text was updated successfully, but these errors were encountered: