Merge branch '2.8' into 3.3

* 2.8:
  #24046 added check for ext-dom to XmlUtil::loadFile
This commit is contained in:
Fabien Potencier 2017-09-04 09:28:07 -07:00
commit 28e7a1377d

View File

@ -37,9 +37,14 @@ class XmlUtils
* @return \DOMDocument
*
* @throws \InvalidArgumentException When loading of XML file returns error
* @throws \RuntimeException When DOM extension is missing
*/
public static function loadFile($file, $schemaOrCallable = null)
{
if (!extension_loaded('dom')) {
throw new \RuntimeException('Extension DOM is required.');
}
$content = @file_get_contents($file);
if ('' === trim($content)) {
throw new \InvalidArgumentException(sprintf('File %s does not contain valid XML, it is empty.', $file));