-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[WebProfilerBundle] Added a conflict for Http-Kernel < 3.1 #19159
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
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
HeahDude
commented
Jun 23, 2016
•
edited
Loading
edited
Q | A |
---|---|
Branch? | 3.1 |
Bug fix? | yes |
New feature? | no |
BC breaks? | no |
Deprecations? | no |
Tests pass? | yes |
Fixed tickets | silexphp/Silex-WebProfiler#94 |
License | MIT |
Doc PR | ~ |
Shouldn't this simply increase the minimum dependency? |
@@ -27,6 +27,9 @@ | |||
"symfony/dependency-injection": "~2.8|~3.0", | |||
"symfony/stopwatch": "~2.8|~3.0" | |||
}, | |||
"conflict": { | |||
"symfony/http-kernel": "<3.1" |
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.
You should then update the require section instead. And we should probably add a test if possible.
@iltar Of courses, I thought about it like it was in |
56fac95
to
d3f47f7
Compare
Thank you @HeahDude. |
fabpot
added a commit
that referenced
this pull request
Jun 24, 2016
… (HeahDude) This PR was merged into the 3.1 branch. Discussion ---------- [WebProfilerBundle] Added a conflict for Http-Kernel < 3.1 | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | silexphp/Silex-WebProfiler#94 | License | MIT | Doc PR | ~ Commits ------- d3f47f7 updated Http-Kernel dependency
Merged
ostrolucky
pushed a commit
to ostrolucky/symfony
that referenced
this pull request
Mar 25, 2018
…l < 3.1 (HeahDude) This PR was merged into the 3.1 branch. Discussion ---------- [WebProfilerBundle] Added a conflict for Http-Kernel < 3.1 | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | silexphp/Silex-WebProfiler#94 | License | MIT | Doc PR | ~ Commits ------- d3f47f7 updated Http-Kernel dependency
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.