Merge branch '9.5'

sebastianbergmann · Jan 1, 2021 · cbe6aa9 · cbe6aa9
2 parents bdc4a4c + f4d6b98
commit cbe6aa9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md
@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 ### Fixed
 
 * [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly
+* [#4572](https://github.com/sebastianbergmann/phpunit/issues/4572): Schema validation does not work with `%xx` sequences in path to `phpunit.xsd`
 
 ## [8.5.13] - 2020-12-01
 

diff --git a/ChangeLog-9.5.md b/ChangeLog-9.5.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 9.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [9.5.1] - 2021-MM-DD
+
+### Fixed
+
+* [#4572](https://github.com/sebastianbergmann/phpunit/issues/4572): Schema validation does not work with `%xx` sequences in path to `phpunit.xsd`
+
 ## [9.5.0] - 2020-12-04
 
 ### Changed
@@ -15,4 +21,5 @@ All notable changes of the PHPUnit 9.5 release series are documented in this fil
 
 * [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly
 
+[9.5.1]: https://github.com/sebastianbergmann/phpunit/compare/9.5.0...9.5
 [9.5.0]: https://github.com/sebastianbergmann/phpunit/compare/9.4.4...9.5.0
diff --git a/src/Util/Xml/Validator.php b/src/Util/Xml/Validator.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Util\Xml;
 
+use function file_get_contents;
 use function libxml_clear_errors;
 use function libxml_get_errors;
 use function libxml_use_internal_errors;
@@ -23,7 +24,7 @@ public function validate(DOMDocument $document, string $xsdFilename): Validation
     {
         $originalErrorHandling = libxml_use_internal_errors(true);
 
-        $document->schemaValidate($xsdFilename);
+        $document->schemaValidateSource(file_get_contents($xsdFilename));
 
         $errors = libxml_get_errors();
         libxml_clear_errors();