Merge branch '3.3' into 3.4

fabpot · fabpot · commit e586839e903b · 2017-12-14T11:45:05.000-08:00
* 3.3:
  Tweak message to be Flex friendly
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -1421,7 +1421,7 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
         }
 
         if (!class_exists('Symfony\Component\Security\Csrf\CsrfToken')) {
-            throw new LogicException('CSRF support cannot be enabled as the Security CSRF component is not installed.');
+            throw new LogicException('CSRF support cannot be enabled as the Security CSRF component is not installed. Try running "composer require security-csrf".');
         }
 
         if (!$this->sessionConfigEnabled) {

Original file line number	Diff line number	Diff line change
`@@ -1421,7 +1421,7 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild`
`1421`	`1421`	`}`
`1422`	`1422`
`1423`	`1423`	`if (!class_exists('Symfony\Component\Security\Csrf\CsrfToken')) {`
`1424`		`- throw new LogicException('CSRF support cannot be enabled as the Security CSRF component is not installed.');`
	`1424`	`+ throw new LogicException('CSRF support cannot be enabled as the Security CSRF component is not installed. Try running "composer require security-csrf".');`
`1425`	`1425`	`}`
`1426`	`1426`
`1427`	`1427`	`if (!$this->sessionConfigEnabled) {`