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

[WebProfilerBundle] Added a conflict for Http-Kernel < 3.1 #19159

Merged
merged 1 commit into from Jun 24, 2016

Conversation

HeahDude
Copy link
Contributor

@HeahDude HeahDude commented Jun 23, 2016

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 ~

@HeahDude HeahDude changed the title added a conflict for Http-Kernel < 3.1 [WebProfilerBundle] Added a conflict for Http-Kernel < 3.1 Jun 23, 2016
@linaori
Copy link
Contributor

linaori commented Jun 23, 2016

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"
Copy link
Member

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.

@HeahDude
Copy link
Contributor Author

@iltar Of courses, I thought about it like it was in require-dev, thanks for noticing :)

@fabpot
Copy link
Member

fabpot commented Jun 24, 2016

Thank you @HeahDude.

@fabpot fabpot merged commit d3f47f7 into symfony:3.1 Jun 24, 2016
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
@HeahDude HeahDude deleted the fix/webprofiler-conflict branch June 24, 2016 05:27
@fabpot fabpot mentioned this pull request Jun 30, 2016
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants