Fix exception messages containing exception messages

nicolas-grekas · nicolas-grekas · commit b79a3230115d · 2020-05-04T16:58:07.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
@@ -79,7 +79,7 @@ public function locate($template, $currentPath = null, $first = true)
         try {
             return $this->cacheHits[$key] = $this->locator->locate($template->getPath(), $currentPath);
         } catch (\InvalidArgumentException $e) {
-            throw new \InvalidArgumentException(sprintf('Unable to find template "%s" : "%s".', $template, $e->getMessage()), 0, $e);
+            throw new \InvalidArgumentException(sprintf('Unable to find template "%s": ', $template).$e->getMessage(), 0, $e);
         }
     }
 }
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -120,7 +120,7 @@ public static function createConnection($dsn, array $options = [])
                 try {
                     @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
                 } catch (\RedisException $e) {
-                    throw new InvalidArgumentException(sprintf('Redis connection failed (%s): "%s".', $e->getMessage(), $dsn));
+                    throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
                 }
 
                 set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -335,7 +335,7 @@ final public function finalize($value)
             } catch (Exception $e) {
                 throw $e;
             } catch (\Exception $e) {
-                throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": '.$e->getMessage(), $this->getPath()), $e->getCode(), $e);
+                throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": ', $this->getPath()).$e->getMessage(), $e->getCode(), $e);
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -126,14 +126,14 @@ protected function getConstructor(Definition $definition, $required)
                 throw new RuntimeException(sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));
             }
         } catch (\ReflectionException $e) {
-            throw new RuntimeException(sprintf('Invalid service "%s": '.lcfirst($e->getMessage()), $this->currentId));
+            throw new RuntimeException(sprintf('Invalid service "%s": ', $this->currentId).lcfirst($e->getMessage()));
         }
         if (!$r = $r->getConstructor()) {
             if ($required) {
                 throw new RuntimeException(sprintf('Invalid service "%s": class%s has no constructor.', $this->currentId, sprintf($class !== $this->currentId ? ' "%s"' : '', $class)));
             }
         } elseif (!$r->isPublic()) {
-            throw new RuntimeException(sprintf('Invalid service "%s": %s must be public.', $this->currentId, sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class)));
+            throw new RuntimeException(sprintf('Invalid service "%s": ', $this->currentId).sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class).' must be public.');
         }
 
         return $r;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -378,7 +378,7 @@ private function parseFileToDOM($file)
         try {
             $dom = XmlUtils::loadFile($file, [$this, 'validateSchema']);
         } catch (\InvalidArgumentException $e) {
-            throw new InvalidArgumentException(sprintf('Unable to parse file "%s": "%s".', $file, $e->getMessage()), $e->getCode(), $e);
+            throw new InvalidArgumentException(sprintf('Unable to parse file "%s": ', $file).$e->getMessage(), $e->getCode(), $e);
         }
 
         $this->validateExtensions($dom, $file);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -660,7 +660,7 @@ protected function loadFile($file)
         try {
             $configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
         } catch (ParseException $e) {
-            throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $file).': '.$e->getMessage(), 0, $e);
+            throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $file).$e->getMessage(), 0, $e);
         } finally {
             restore_error_handler();
         }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -88,7 +88,7 @@ public function getController(Request $request)
         try {
             $callable = $this->createController($controller);
         } catch (\InvalidArgumentException $e) {
-            throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$e->getMessage(), $request->getPathInfo()), 0, $e);
+            throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$e->getMessage(), 0, $e);
         }
 
         return $callable;
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -66,7 +66,7 @@ public function load($file, $type = null)
         try {
             $parsedConfig = $this->yamlParser->parseFile($path);
         } catch (ParseException $e) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);
+            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);
         } finally {
             restore_error_handler();
         }
diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
@@ -100,7 +100,7 @@ public function handle(GetResponseEvent $event)
             try {
                 $this->tokenStorage->setToken($this->attemptSwitchUser($request, $username));
             } catch (AuthenticationException $e) {
-                throw new \LogicException(sprintf('Switch User failed: "%s".', $e->getMessage()));
+                throw new \LogicException('Switch User failed: '.$e->getMessage());
             }
         }
 
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -53,7 +53,7 @@ private function extract($resource, MessageCatalogue $catalogue, $domain)
         try {
             $dom = XmlUtils::loadFile($resource);
         } catch (\InvalidArgumentException $e) {
-            throw new InvalidResourceException(sprintf('Unable to load "%s": '.$e->getMessage(), $resource), $e->getCode(), $e);
+            throw new InvalidResourceException(sprintf('Unable to load "%s": ', $resource).$e->getMessage(), $e->getCode(), $e);
         }
 
         $xliffVersion = $this->getVersionNumber($dom);
diff --git a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
@@ -47,7 +47,7 @@ protected function loadResource($resource)
         try {
             $messages = $this->yamlParser->parseFile($resource);
         } catch (ParseException $e) {
-            throw new InvalidResourceException(sprintf('The file "%s" does not contain valid YAML', $resource).': '.$e->getMessage(), 0, $e);
+            throw new InvalidResourceException(sprintf('The file "%s" does not contain valid YAML: ', $resource).$e->getMessage(), 0, $e);
         } finally {
             restore_error_handler();
         }
diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
@@ -55,7 +55,7 @@ public function validate($value, Constraint $constraint)
             try {
                 $comparedValue = $this->getPropertyAccessor()->getValue($object, $path);
             } catch (NoSuchPropertyException $e) {
-                throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: '.$e->getMessage(), $path, \get_class($constraint)), 0, $e);
+                throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: ', $path, \get_class($constraint)).$e->getMessage(), 0, $e);
             }
         } else {
             $comparedValue = $constraint->value;
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -124,7 +124,7 @@ private function parseFile($path)
         try {
             $classes = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
         } catch (ParseException $e) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);
+            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);
         } finally {
             restore_error_handler();
         }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function locate($template, $currentPath = null, $first = true)`
`79`	`79`	`try {`
`80`	`80`	`return $this->cacheHits[$key] = $this->locator->locate($template->getPath(), $currentPath);`
`81`	`81`	`} catch (\InvalidArgumentException $e) {`
`82`		`- throw new \InvalidArgumentException(sprintf('Unable to find template "%s" : "%s".', $template, $e->getMessage()), 0, $e);`
	`82`	`+ throw new \InvalidArgumentException(sprintf('Unable to find template "%s": ', $template).$e->getMessage(), 0, $e);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public static function createConnection($dsn, array $options = [])`
`120`	`120`	`try {`
`121`	`121`	`@$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);`
`122`	`122`	`} catch (\RedisException $e) {`
`123`		`- throw new InvalidArgumentException(sprintf('Redis connection failed (%s): "%s".', $e->getMessage(), $dsn));`
	`123`	`+ throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ final public function finalize($value)`
`335`	`335`	`} catch (Exception $e) {`
`336`	`336`	`throw $e;`
`337`	`337`	`} catch (\Exception $e) {`
`338`		`- throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": '.$e->getMessage(), $this->getPath()), $e->getCode(), $e);`
	`338`	`+ throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": ', $this->getPath()).$e->getMessage(), $e->getCode(), $e);`
`339`	`339`	`}`
`340`	`340`	`}`
`341`	`341`
Original file line number	Diff line number	Diff line change
`@@ -126,14 +126,14 @@ protected function getConstructor(Definition $definition, $required)`
`126`	`126`	`throw new RuntimeException(sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));`
`127`	`127`	`}`
`128`	`128`	`} catch (\ReflectionException $e) {`
`129`		`- throw new RuntimeException(sprintf('Invalid service "%s": '.lcfirst($e->getMessage()), $this->currentId));`
	`129`	`+ throw new RuntimeException(sprintf('Invalid service "%s": ', $this->currentId).lcfirst($e->getMessage()));`
`130`	`130`	`}`
`131`	`131`	`if (!$r = $r->getConstructor()) {`
`132`	`132`	`if ($required) {`
`133`	`133`	`throw new RuntimeException(sprintf('Invalid service "%s": class%s has no constructor.', $this->currentId, sprintf($class !== $this->currentId ? ' "%s"' : '', $class)));`
`134`	`134`	`}`
`135`	`135`	`} elseif (!$r->isPublic()) {`
`136`		`- throw new RuntimeException(sprintf('Invalid service "%s": %s must be public.', $this->currentId, sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class)));`
	`136`	`+ throw new RuntimeException(sprintf('Invalid service "%s": ', $this->currentId).sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class).' must be public.');`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`return $r;`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ private function parseFileToDOM($file)`
`378`	`378`	`try {`
`379`	`379`	`$dom = XmlUtils::loadFile($file, [$this, 'validateSchema']);`
`380`	`380`	`} catch (\InvalidArgumentException $e) {`
`381`		`- throw new InvalidArgumentException(sprintf('Unable to parse file "%s": "%s".', $file, $e->getMessage()), $e->getCode(), $e);`
	`381`	`+ throw new InvalidArgumentException(sprintf('Unable to parse file "%s": ', $file).$e->getMessage(), $e->getCode(), $e);`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`$this->validateExtensions($dom, $file);`
Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ protected function loadFile($file)`
`660`	`660`	`try {`
`661`	`661`	`$configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT \| Yaml::PARSE_CUSTOM_TAGS);`
`662`	`662`	`} catch (ParseException $e) {`
`663`		`- throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $file).': '.$e->getMessage(), 0, $e);`
	`663`	`+ throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $file).$e->getMessage(), 0, $e);`
`664`	`664`	`} finally {`
`665`	`665`	`restore_error_handler();`
`666`	`666`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function getController(Request $request)`
`88`	`88`	`try {`
`89`	`89`	`$callable = $this->createController($controller);`
`90`	`90`	`} catch (\InvalidArgumentException $e) {`
`91`		`- throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$e->getMessage(), $request->getPathInfo()), 0, $e);`
	`91`	`+ throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$e->getMessage(), 0, $e);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`return $callable;`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function load($file, $type = null)`
`66`	`66`	`try {`
`67`	`67`	`$parsedConfig = $this->yamlParser->parseFile($path);`
`68`	`68`	`} catch (ParseException $e) {`
`69`		`- throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);`
	`69`	`+ throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);`
`70`	`70`	`} finally {`
`71`	`71`	`restore_error_handler();`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function handle(GetResponseEvent $event)`
`100`	`100`	`try {`
`101`	`101`	`$this->tokenStorage->setToken($this->attemptSwitchUser($request, $username));`
`102`	`102`	`} catch (AuthenticationException $e) {`
`103`		`- throw new \LogicException(sprintf('Switch User failed: "%s".', $e->getMessage()));`
	`103`	`+ throw new \LogicException('Switch User failed: '.$e->getMessage());`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private function extract($resource, MessageCatalogue $catalogue, $domain)`
`53`	`53`	`try {`
`54`	`54`	`$dom = XmlUtils::loadFile($resource);`
`55`	`55`	`} catch (\InvalidArgumentException $e) {`
`56`		`- throw new InvalidResourceException(sprintf('Unable to load "%s": '.$e->getMessage(), $resource), $e->getCode(), $e);`
	`56`	`+ throw new InvalidResourceException(sprintf('Unable to load "%s": ', $resource).$e->getMessage(), $e->getCode(), $e);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`$xliffVersion = $this->getVersionNumber($dom);`