Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a91b5a5

Browse filesBrowse files
committed
Merge branch '3.4' into 4.0
* 3.4: Revert "bug #25151 [FrameworkBundle] Automatically enable the CSRF protection if CSRF manager exists (sroze)" Revert "bug #25502 Fixing wrong class_exists on interface (weaverryan)"
2 parents a6fa4a3 + 903f120 commit a91b5a5
Copy full SHA for a91b5a5

File tree

Expand file treeCollapse file tree

1 file changed

+1
-2
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-2
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
use Symfony\Component\Form\Form;
2222
use Symfony\Component\Lock\Lock;
2323
use Symfony\Component\Lock\Store\SemaphoreStore;
24-
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
2524
use Symfony\Component\Serializer\Serializer;
2625
use Symfony\Component\Translation\Translator;
2726
use Symfony\Component\Validator\Validation;
@@ -110,7 +109,7 @@ private function addCsrfSection(ArrayNodeDefinition $rootNode)
110109
$rootNode
111110
->children()
112111
->arrayNode('csrf_protection')
113-
->{!class_exists(FullStack::class) && interface_exists(CsrfTokenManagerInterface::class) ? 'canBeDisabled' : 'canBeEnabled'}()
112+
->canBeEnabled()
114113
->end()
115114
->end()
116115
;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.