minor #25636 Backport Flex-specific error messages in controller shortcuts to 3.4 (weaverryan)

fabpot · fabpot · commit abfa3eeca564 · 2018-01-03T18:28:45.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- Backport Flex-specific error messages in controller shortcuts to 3.4 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25133 (comment) | License | MIT | Doc PR | n/a Commits ------- 419e934 Proposing Flex-specific error messages in the controller shortcuts
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
@@ -194,7 +194,7 @@ protected function file($file, $fileName = null, $disposition = ResponseHeaderBa
     protected function addFlash($type, $message)
     {
         if (!$this->container->has('session')) {
-            throw new \LogicException('You can not use the addFlash method if sessions are disabled.');
+            throw new \LogicException('You can not use the addFlash method if sessions are disabled. Enable them in "config/packages/framework.yaml".');
         }
 
         $this->container->get('session')->getFlashBag()->add($type, $message);
@@ -215,7 +215,7 @@ protected function addFlash($type, $message)
     protected function isGranted($attributes, $subject = null)
     {
         if (!$this->container->has('security.authorization_checker')) {
-            throw new \LogicException('The SecurityBundle is not registered in your application.');
+            throw new \LogicException('The SecurityBundle is not registered in your application. Try running "composer require security".');
         }
 
         return $this->container->get('security.authorization_checker')->isGranted($attributes, $subject);
@@ -261,7 +261,7 @@ protected function renderView($view, array $parameters = array())
         }
 
         if (!$this->container->has('twig')) {
-            throw new \LogicException('You can not use the "renderView" method if the Templating Component or the Twig Bundle are not available.');
+            throw new \LogicException('You can not use the "renderView" method if the Templating Component or the Twig Bundle are not available. Try running "composer require twig".');
         }
 
         return $this->container->get('twig')->render($view, $parameters);
@@ -285,7 +285,7 @@ protected function render($view, array $parameters = array(), Response $response
         } elseif ($this->container->has('twig')) {
             $content = $this->container->get('twig')->render($view, $parameters);
         } else {
-            throw new \LogicException('You can not use the "render" method if the Templating Component or the Twig Bundle are not available.');
+            throw new \LogicException('You can not use the "render" method if the Templating Component or the Twig Bundle are not available. Try running "composer require twig".');
         }
 
         if (null === $response) {
@@ -323,7 +323,7 @@ protected function stream($view, array $parameters = array(), StreamedResponse $
                 $twig->display($view, $parameters);
             };
         } else {
-            throw new \LogicException('You can not use the "stream" method if the Templating Component or the Twig Bundle are not available.');
+            throw new \LogicException('You can not use the "stream" method if the Templating Component or the Twig Bundle are not available. Try running "composer require twig".');
         }
 
         if (null === $response) {
@@ -373,7 +373,7 @@ protected function createNotFoundException($message = 'Not Found', \Exception $p
     protected function createAccessDeniedException($message = 'Access Denied.', \Exception $previous = null)
     {
         if (!class_exists(AccessDeniedException::class)) {
-            throw new \LogicException('You can not use the "createAccessDeniedException" method if the Security component is not available.');
+            throw new \LogicException('You can not use the "createAccessDeniedException" method if the Security component is not available. Try running "composer require security".');
         }
 
         return new AccessDeniedException($message, $previous);
@@ -422,7 +422,7 @@ protected function createFormBuilder($data = null, array $options = array())
     protected function getDoctrine()
     {
         if (!$this->container->has('doctrine')) {
-            throw new \LogicException('The DoctrineBundle is not registered in your application.');
+            throw new \LogicException('The DoctrineBundle is not registered in your application. Try running "composer require doctrine".');
         }
 
         return $this->container->get('doctrine');
@@ -442,7 +442,7 @@ protected function getDoctrine()
     protected function getUser()
     {
         if (!$this->container->has('security.token_storage')) {
-            throw new \LogicException('The SecurityBundle is not registered in your application.');
+            throw new \LogicException('The SecurityBundle is not registered in your application. Try running "composer require security".');
         }
 
         if (null === $token = $this->container->get('security.token_storage')->getToken()) {
@@ -470,7 +470,7 @@ protected function getUser()
     protected function isCsrfTokenValid($id, $token)
     {
         if (!$this->container->has('security.csrf.token_manager')) {
-            throw new \LogicException('CSRF protection is not enabled in your application.');
+            throw new \LogicException('CSRF protection is not enabled in your application. Enable it with the "csrf_protection" key in "config/packages/framework.yaml".');
         }
 
         return $this->container->get('security.csrf.token_manager')->isTokenValid(new CsrfToken($id, $token));

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ protected function file($file, $fileName = null, $disposition = ResponseHeaderBa`
`194`	`194`	`protected function addFlash($type, $message)`
`195`	`195`	`{`
`196`	`196`	`if (!$this->container->has('session')) {`
`197`		`- throw new \LogicException('You can not use the addFlash method if sessions are disabled.');`
	`197`	`+ throw new \LogicException('You can not use the addFlash method if sessions are disabled. Enable them in "config/packages/framework.yaml".');`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`$this->container->get('session')->getFlashBag()->add($type, $message);`
`@@ -215,7 +215,7 @@ protected function addFlash($type, $message)`
`215`	`215`	`protected function isGranted($attributes, $subject = null)`
`216`	`216`	`{`
`217`	`217`	`if (!$this->container->has('security.authorization_checker')) {`
`218`		`- throw new \LogicException('The SecurityBundle is not registered in your application.');`
	`218`	`+ throw new \LogicException('The SecurityBundle is not registered in your application. Try running "composer require security".');`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`return $this->container->get('security.authorization_checker')->isGranted($attributes, $subject);`
`@@ -261,7 +261,7 @@ protected function renderView($view, array $parameters = array())`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`if (!$this->container->has('twig')) {`
`264`		`- throw new \LogicException('You can not use the "renderView" method if the Templating Component or the Twig Bundle are not available.');`
	`264`	`+ throw new \LogicException('You can not use the "renderView" method if the Templating Component or the Twig Bundle are not available. Try running "composer require twig".');`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`return $this->container->get('twig')->render($view, $parameters);`
`@@ -285,7 +285,7 @@ protected function render($view, array $parameters = array(), Response $response`
`285`	`285`	`} elseif ($this->container->has('twig')) {`
`286`	`286`	`$content = $this->container->get('twig')->render($view, $parameters);`
`287`	`287`	`} else {`
`288`		`- throw new \LogicException('You can not use the "render" method if the Templating Component or the Twig Bundle are not available.');`
	`288`	`+ throw new \LogicException('You can not use the "render" method if the Templating Component or the Twig Bundle are not available. Try running "composer require twig".');`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`if (null === $response) {`
`@@ -323,7 +323,7 @@ protected function stream($view, array $parameters = array(), StreamedResponse $`
`323`	`323`	`$twig->display($view, $parameters);`
`324`	`324`	`};`
`325`	`325`	`} else {`
`326`		`- throw new \LogicException('You can not use the "stream" method if the Templating Component or the Twig Bundle are not available.');`
	`326`	`+ throw new \LogicException('You can not use the "stream" method if the Templating Component or the Twig Bundle are not available. Try running "composer require twig".');`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`if (null === $response) {`
`@@ -373,7 +373,7 @@ protected function createNotFoundException($message = 'Not Found', \Exception $p`
`373`	`373`	`protected function createAccessDeniedException($message = 'Access Denied.', \Exception $previous = null)`
`374`	`374`	`{`
`375`	`375`	`if (!class_exists(AccessDeniedException::class)) {`
`376`		`- throw new \LogicException('You can not use the "createAccessDeniedException" method if the Security component is not available.');`
	`376`	`+ throw new \LogicException('You can not use the "createAccessDeniedException" method if the Security component is not available. Try running "composer require security".');`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`return new AccessDeniedException($message, $previous);`
`@@ -422,7 +422,7 @@ protected function createFormBuilder($data = null, array $options = array())`
`422`	`422`	`protected function getDoctrine()`
`423`	`423`	`{`
`424`	`424`	`if (!$this->container->has('doctrine')) {`
`425`		`- throw new \LogicException('The DoctrineBundle is not registered in your application.');`
	`425`	`+ throw new \LogicException('The DoctrineBundle is not registered in your application. Try running "composer require doctrine".');`
`426`	`426`	`}`
`427`	`427`
`428`< A8F6 /td>	`428`	`return $this->container->get('doctrine');`
`@@ -442,7 +442,7 @@ protected function getDoctrine()`
`442`	`442`	`protected function getUser()`
`443`	`443`	`{`
`444`	`444`	`if (!$this->container->has('security.token_storage')) {`
`445`		`- throw new \LogicException('The SecurityBundle is not registered in your application.');`
	`445`	`+ throw new \LogicException('The SecurityBundle is not registered in your application. Try running "composer require security".');`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`if (null === $token = $this->container->get('security.token_storage')->getToken()) {`
`@@ -470,7 +470,7 @@ protected function getUser()`
`470`	`470`	`protected function isCsrfTokenValid($id, $token)`
`471`	`471`	`{`
`472`	`472`	`if (!$this->container->has('security.csrf.token_manager')) {`
`473`		`- throw new \LogicException('CSRF protection is not enabled in your application.');`
	`473`	`+ throw new \LogicException('CSRF protection is not enabled in your application. Enable it with the "csrf_protection" key in "config/packages/framework.yaml".');`
`474`	`474`	`}`
`475`	`475`
`476`	`476`	`return $this->container->get('security.csrf.token_manager')->isTokenValid(new CsrfToken($id, $token));`