Merge branch '3.4' into 4.4

* 3.4: Fix quotes in exception messages
symfony · Mar 16, 2020 · 0c8d87a · 0c8d87a
2 parents 96fb0ca + fc5be36
commit 0c8d87a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Definition/ArrayNode.php b/Definition/ArrayNode.php
@@ -215,7 +215,7 @@ public function addChild(NodeInterface $node)
     protected function finalizeValue($value)
     {
         if (false === $value) {
-            throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value)));
+            throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: "%s".', $this->getPath(), json_encode($value)));
         }
 
         foreach ($this->children as $name => $child) {

diff --git a/Definition/PrototypedArrayNode.php b/Definition/PrototypedArrayNode.php
@@ -185,7 +185,7 @@ public function addChild(NodeInterface $node)
     protected function finalizeValue($value)
     {
         if (false === $value) {
-            throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: %s.', $this->getPath(), json_encode($value)));
+            throw new UnsetKeyException(sprintf('Unsetting key for path "%s", value: "%s".', $this->getPath(), json_encode($value)));
         }
 
         foreach ($value as $k => $v) {

diff --git a/FileLocator.php b/FileLocator.php
@@ -68,7 +68,7 @@ public function locate($name, $currentPath = null, $first = true)
         }
 
         if (!$filepaths) {
-            throw new FileLocatorFileNotFoundException(sprintf('The file "%s" does not exist (in: %s).', $name, implode(', ', $paths)), 0, null, $notfound);
+            throw new FileLocatorFileNotFoundException(sprintf('The file "%s" does not exist (in: "%s").', $name, implode('", "', $paths)), 0, null, $notfound);
         }
 
         return $filepaths;