[Form] Drop remaing CsrfProviderAdapter/Interface mentions #16692
+28
−189
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
849247d to
18240e2
Compare
| @@ -121,30 +113,12 @@ public function finishView(FormView $view, FormInterface $form, array $options) | |||
| */ | |||
| public function configureOptions(OptionsResolver $resolver) | |||
| { | |||
| // BC clause for the "intention" option | |||
| $csrfTokenId = function (Options $options) { | |||
| return $options['intention']; | |||
There was a problem hiding this comment.
we were missing a deprecation notice when the user passes intention rather than csrf_token_id though
|
Can you apply the fabbot fixes? Also, CsrfFormLoginTest fails on 5.5. Is this related? 👍 otherwise |
13d7a06 to
abf92f9
Compare
| @@ -29,7 +29,7 @@ public function __construct() | |||
| $this->addOption('username_parameter', '_username'); | |||
| $this->addOption('password_parameter', '_password'); | |||
| $this->addOption('csrf_parameter', '_csrf_token'); | |||
| $this->addOption('intention', 'authenticate'); | |||
| $this->addOption('csrf_token_id', 'authenticate'); | |||
There was a problem hiding this comment.
2.8 is missing a deprecation+bc-layer for renaming intention to csrf_token_id. Could someone give it a try? @stof? Any other @symfony/deciders?
abf92f9 to
5bc34d2
Compare
|
@nicolas-grekas Will you remove the deprecated related config options from the SecurityBundle here too or should I open a separate pull request? |
|
@xabbuh please do |
|
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
Nov 28, 2015
…ions (nicolas-grekas) This PR was merged into the 3.0-dev branch. Discussion ---------- [Form] Drop remaing CsrfProviderAdapter/Interface mentions | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - CsrfProviderAdapter+Interface have already been removed from master, we should not use them anymore. Let's see if tests agree. Commits ------- 5bc34d2 [Form] Drop remaing CsrfProviderAdapter/Interface mentions
Merged
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.
CsrfProviderAdapter+Interface have already been removed from master, we should not use them anymore. Let's see if tests agree.