Skip to content

Commit 89cdf3c

Browse files
committed
Merge branch '2.3' into 2.6
* 2.3: Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)" InvalidResourceException file name [Validators] Remove forgotten space in a translation key [nl] [Validators] Correct translation key and content [nl] added missing CVE number bumped Symfony version to 2.3.30 updated VERSION for 2.3.29 update CONTRIBUTORS for 2.3.29 updated CHANGELOG for 2.3.29 [CS] [Console] StreamOuput : fix loose comparison [DependencyInjection] Avoid unnecessary calls to strtolower() Conflicts: src/Symfony/Component/Console/Output/StreamOutput.php src/Symfony/Component/HttpKernel/Kernel.php
2 parents d030b3d + 0e1d974 commit 89cdf3c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Loader/XliffFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private function parseFile($file)
148148
$source = str_replace('http://www.w3.org/2001/xml.xsd', $location, $source);
149149

150150
if (!@$dom->schemaValidateSource($source)) {
151-
throw new InvalidResourceException(implode("\n", $this->getXmlErrors($internalErrors)));
151+
throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $file, implode("\n", $this->getXmlErrors($internalErrors))));
152152
}
153153

154154
$dom->normalizeDocument();

0 commit comments

Comments
 (0)