Proposing Flex-specific error messages in the controller shortcuts

weaverryan · Robin Chalas · commit 38d12ea4e3c3 · 2017-12-30T19:43:37.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
@@ -153,7 +153,7 @@ protected function file($file, string $fileName = null, string $disposition = Re
     protected function addFlash(string $type, string $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);
@@ -169,7 +169,7 @@ protected function addFlash(string $type, string $message)
     protected function isGranted($attributes, $subject = null): bool
     {
         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);
@@ -206,7 +206,7 @@ protected function renderView(string $view, array $parameters = array()): string
         }
 
         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);
@@ -224,7 +224,7 @@ protected function render(string $view, array $parameters = array(), Response $r
         } 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) {
@@ -256,7 +256,7 @@ protected function stream(string $view, array $parameters = array(), StreamedRes
                 $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) {
@@ -296,7 +296,7 @@ protected function createNotFoundException(string $message = 'Not Found', \Excep
     protected function createAccessDeniedException(string $message = 'Access Denied.', \Exception $previous = null): AccessDeniedException
     {
         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);
@@ -332,7 +332,7 @@ protected function createFormBuilder($data = null, array $options = array()): Fo
     protected function getDoctrine(): ManagerRegistry
     {
         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');
@@ -352,7 +352,7 @@ protected function getDoctrine(): ManagerRegistry
     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()) {
@@ -378,7 +378,7 @@ protected function getUser()
     protected function isCsrfTokenValid(string $id, string $token): bool
     {
         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
`@@ -153,7 +153,7 @@ protected function file($file, string $fileName = null, string $disposition = Re`
`153`	`153`	`protected function addFlash(string $type, string $message)`
`154`	`154`	`{`
`155`	`155`	`if (!$this->container->has('session')) {`
`156`		`- throw new \LogicException('You can not use the addFlash method if sessions are disabled.');`
	`156`	`+ throw new \LogicException('You can not use the addFlash method if sessions are disabled. Enable them in config/packages/framework.yaml.');`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`$this->container->get('session')->getFlashBag()->add($type, $message);`
`@@ -169,7 +169,7 @@ protected function addFlash(string $type, string $message)`
`169`	`169`	`protected function isGranted($attributes, $subject = null): bool`
`170`	`170`	`{`
`171`	`171`	`if (!$this->container->has('security.authorization_checker')) {`
`172`		`- throw new \LogicException('The SecurityBundle is not registered in your application.');`
	`172`	`+ throw new \LogicException('The SecurityBundle is not registered in your application. Try running "composer require security"');`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`return $this->container->get('security.authorization_checker')->isGranted($attributes, $subject);`
`@@ -206,7 +206,7 @@ protected function renderView(string $view, array $parameters = array()): string`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`if (!$this->container->has('twig')) {`
`209`		`- throw new \LogicException('You can not use the "renderView" method if the Templating Component or the Twig Bundle are not available.');`
	`209`	`+ 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"');`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`return $this->container->get('twig')->render($view, $parameters);`
`@@ -224,7 +224,7 @@ protected function render(string $view, array $parameters = array(), Response $r`
`224`	`224`	`} elseif ($this->container->has('twig')) {`
`225`	`225`	`$content = $this->container->get('twig')->render($view, $parameters);`
`226`	`226`	`} else {`
`227`		`- throw new \LogicException('You can not use the "render" method if the Templating Component or the Twig Bundle are not available.');`
	`227`	`+ 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"');`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`if (null === $response) {`
`@@ -256,7 +256,7 @@ protected function stream(string $view, array $parameters = array(), StreamedRes`
`256`	`256`	`$twig->display($view, $parameters);`
`257`	`257`	`};`
`258`	`258`	`} else {`
`259`		`- throw new \LogicException('You can not use the "stream" method if the Templating Component or the Twig Bundle are not available.');`
	`259`	`+ 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"');`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`if (null === $response) {`
`@@ -296,7 +296,7 @@ protected function createNotFoundException(string $message = 'Not Found', \Excep`
`296`	`296`	`protected function createAccessDeniedException(string $message = 'Access Denied.', \Exception $previous = null): AccessDeniedException`
`297`	`297`	`{`
`298`	`298`	`if (!class_exists(AccessDeniedException::class)) {`
`299`		`- throw new \LogicException('You can not use the "createAccessDeniedException" method if the Security component is not available.');`
	`299`	`+ throw new \LogicException('You can not use the "createAccessDeniedException" method if the Security component is not available. Try running "composer require security"');`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`return new AccessDeniedException($message, $previous);`
`@@ -332,7 +332,7 @@ protected function createFormBuilder($data = null, array $options = array()): Fo`
`332`	`332`	`protected function getDoctrine(): ManagerRegistry`
`333`	`333`	`{`
`334`	`334`	`if (!$this->container->has('doctrine')) {`
`335`		`- throw new \LogicException('The DoctrineBundle is not registered in your application.');`
	`335`	`+ throw new \LogicException('The DoctrineBundle is not registered in your application. Try running "composer require doctrine"');`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`return $this->container->get('doctrine');`
`@@ -352,7 +352,7 @@ protected function getDoctrine(): ManagerRegistry`
`352`	`352`	`protected function getUser()`
`353`	`353`	`{`
`354`	`354`	`if (!$this->container->has('security.token_storage')) {`
`355`		`- throw new \LogicException('The SecurityBundle is not registered in your application.');`
	`355`	`+ throw new \LogicException('The SecurityBundle is not registered in your application. Try running "composer require security"');`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`if (null === $token = $this->container->get('security.token_storage')->getToken()) {`
`@@ -378,7 +378,7 @@ protected function getUser()`
`378`	`378`	`protected function isCsrfTokenValid(string $id, string $token): bool`
`379`	`379`	`{`
`380`	`380`	`if (!$this->container->has('security.csrf.token_manager')) {`
`381`		`- throw new \LogicException('CSRF protection is not enabled in your application.');`
	`381`	`+ throw new \LogicException('CSRF protection is not enabled in your application. Enable it with the "csrf_protection" key in "config/packages/framework.yaml"');`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`return $this->container->get('security.csrf.token_manager')->isTokenValid(new CsrfToken($id, $token));`