Merge pull request #1386 from sun/xml-load-strict

Limit strict error handling in XML::load() to configuration
sebastianbergmann · Aug 13, 2014 · 2f15988 · 2f15988
2 parents e50a0c4 + fb7caed
commit 2f15988
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php
@@ -193,7 +193,7 @@ class PHPUnit_Util_Configuration
     protected function __construct($filename)
     {
         $this->filename = $filename;
-        $this->document = PHPUnit_Util_XML::loadFile($filename, false, true);
+        $this->document = PHPUnit_Util_XML::loadFile($filename, false, true, true);
         $this->xpath    = new DOMXPath($this->document);
     }
 

diff --git a/src/Util/XML.php b/src/Util/XML.php
@@ -84,10 +84,11 @@ public static function prepareString($string)
      * @param  string      $filename
      * @param  boolean     $isHtml
      * @param  boolean     $xinclude
+     * @param  boolean     $strict
      * @return DOMDocument
      * @since  Method available since Release 3.3.0
      */
-    public static function loadFile($filename, $isHtml = false, $xinclude = false)
+    public static function loadFile($filename, $isHtml = false, $xinclude = false, $strict = false)
     {
         $reporting = error_reporting(0);
         $contents  = file_get_contents($filename);
@@ -102,7 +103,7 @@ public static function loadFile($filename, $isHtml = false, $xinclude = false)
             );
         }
 
-        return self::load($contents, $isHtml, $filename, $xinclude);
+        return self::load($contents, $isHtml, $filename, $xinclude, $strict);
     }
 
     /**
@@ -123,13 +124,14 @@ public static function loadFile($filename, $isHtml = false, $xinclude = false)
      * @param  boolean            $isHtml
      * @param  string             $filename
      * @param  boolean            $xinclude
+     * @param  boolean            $strict
      * @return DOMDocument
      * @since  Method available since Release 3.3.0
      * @author Mike Naberezny <[email protected]>
      * @author Derek DeVries <[email protected]>
      * @author Tobias Schlitt <[email protected]>
      */
-    public static function load($actual, $isHtml = false, $filename = '', $xinclude = false)
+    public static function load($actual, $isHtml = false, $filename = '', $xinclude = false, $strict = false)
     {
         if ($actual instanceof DOMDocument) {
             return $actual;
@@ -173,7 +175,7 @@ public static function load($actual, $isHtml = false, $filename = '', $xinclude
             chdir($cwd);
         }
 
-        if ($loaded === false || $message !== '') {
+        if ($loaded === false || ($strict && $message !== '')) {
             if ($filename !== '') {
                 throw new PHPUnit_Framework_Exception(
                   sprintf(