Skip to content

Commit cc1907b

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: (21 commits) 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] bumped Symfony version to 2.6.9 updated VERSION for 2.6.8 updated CHANGELOG for 2.6.8 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 [Validators] Missing translations for arabic language. Code style fixed C [HttpKernel][Bundle] Check extension implements ExtensionInterface [DebugBundle] Fix config XSD [CS] [Console] StreamOuput : fix loose comparison [Framework][router commands] fixed failing test. [HttpKernel] Do not call the FragmentListener if _controller is already defined ... Conflicts: src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
2 parents 9ddb421 + 89cdf3c commit cc1907b

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)