[Security] Clean deps #16440
Merged
[Security] Clean deps #16440
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
| "symfony/expression-language": "~2.6|~3.0.0", | ||
| "symfony/ldap": "~2.8|~3.0.0" | ||
| "symfony/ldap": "~2.8|~3.0.0", | ||
| "psr/log": "~1.0" |
There was a problem hiding this comment.
I suggest keeping psr/log in the same place to make conflicts a bit less likely when merging branches
There was a problem hiding this comment.
there is already a conflict in both cases (2.7 -> 2.8 and 2.8 -> master) that we have to resolve everytime so this change won't enhance nor degrade anything here...
There was a problem hiding this comment.
oh, and it's already at the last position in master:
https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Security/composer.json#L44
620c1e9 to
87b7b2c
Compare
| "doctrine/common": "~2.2", | ||
| "doctrine/dbal": "~2.2", | ||
| "psr/log": "~1.0", | ||
| "symfony/validator": "~2.5,>=2.5.9|~3.0.0", |
There was a problem hiding this comment.
2.5.9 is the version where lowest deps where fixed for symfony/validator
There was a problem hiding this comment.
shouldn't it be fixed in older branches too then ?
87b7b2c to
c2b3b0a
Compare
c2b3b0a to
ae072b7
Compare
|
👍 |
nicolas-grekas
added a commit
that referenced
this pull request
Nov 3, 2015
This PR was merged into the 2.8 branch. Discussion ---------- [Security] Clean deps | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This follows the split of security-acl. Commits ------- ae072b7 [Security] Clean deps
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.
This follows the split of security-acl.