Skip to content

Commit 29a61a2

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Add missing dots at the end of exception messages
2 parents 43fbae2 + 2f04b78 commit 29a61a2

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Controller/ControllerResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function getController(Request $request)
8585
try {
8686
$callable = $this->createController($controller);
8787
} catch (\InvalidArgumentException $e) {
88-
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $e->getMessage()), 0, $e);
88+
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s.', $request->getPathInfo(), $e->getMessage()), 0, $e);
8989
}
9090

9191
if (!\is_callable($callable)) {

DataCollector/DumpDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1)
198198
$dumper = new HtmlDumper($data, $this->charset);
199199
$dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
200200
} else {
201-
throw new \InvalidArgumentException(sprintf('Invalid dump format: %s', $format));
201+
throw new \InvalidArgumentException(sprintf('Invalid dump format: %s.', $format));
202202
}
203203
$dumps = [];
204204

Fragment/HIncludeFragmentRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function __construct($templating = null, UriSigner $signer = null, string
5757
public function setTemplating($templating)
5858
{
5959
if (null !== $templating && !$templating instanceof EngineInterface && !$templating instanceof Environment) {
60-
throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of Twig\Environment or Symfony\Component\Templating\EngineInterface');
60+
throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of Twig\Environment or Symfony\Component\Templating\EngineInterface.');
6161
}
6262

6363
if ($templating instanceof EngineInterface) {

Kernel.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ protected function initializeBundles()
449449
foreach ($this->registerBundles() as $bundle) {
450450
$name = $bundle->getName();
451451
if (isset($this->bundles[$name])) {
452-
throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s"', $name));
452+
throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s".', $name));
453453
}
454454
$this->bundles[$name] = $bundle;
455455
}
@@ -713,10 +713,10 @@ protected function buildContainer()
713713
foreach (['cache' => $this->warmupDir ?: $this->getCacheDir(), 'logs' => $this->getLogDir()] as $name => $dir) {
714714
if (!is_dir($dir)) {
715715
if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
716-
throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
716+
throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n.", $name, $dir));
717717
}
718718
} elseif (!is_writable($dir)) {
719-
throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", $name, $dir));
719+
throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n.", $name, $dir));
720720
}
721721
}
722722

0 commit comments

Comments
 (0)