Merge remote-tracking branch 'origin/2.7' into 2.8

fabpot · fabpot · commit 5d2af1ef4c1a · 2017-09-04T09:26:37.000-07:00
* origin/2.7: #24046 added check for ext-dom to XmlUtil::loadFile
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -37,9 +37,14 @@ private function __construct()
      * @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));
