Raise coverage

Author: tvdijen

src/SchemaValidatableElementTrait.php

@@ -14,8 +14,6 @@
 use function file_exists;
 use function implode;
 use function libxml_get_errors;
-use function restore_error_handler;
-use function set_error_handler;
 use function sprintf;
 use function trim;
 
@@ -35,22 +33,11 @@ trait SchemaValidatableElementTrait
     public static function schemaValidate(DOMDocument $document): DOMDocument
     {
         $schemaFile = self::getSchemaFile();
+        // Must suppress the warnings here in order to throw them as an error below.
+        $result = @$document->schemaValidate($schemaFile);
 
-        // Dirty trick to catch the warnings emitted by XML-DOMs schemaValidate
-        // This will turn the warning into an exception
-        set_error_handler(static function (int $errno, string $errstr): never {
-            throw new SchemaViolationException($errstr, $errno);
-        }, E_WARNING);
-
-        try {
-            $result = $document->schemaValidate($schemaFile);
-        } finally {
-            // Restore the error handler, whether we throw an exception or not
-            restore_error_handler();
-        }
-
-        $msgs = [];
         if ($result === false) {
+            $msgs = [];
             foreach (libxml_get_errors() as $err) {
                 $msgs[] = trim($err->message) . ' on line ' . $err->line;
             }

tests/Utils/URIElement.php

@@ -6,14 +6,17 @@
 
 use SimpleSAML\XML\AbstractElement;
 use SimpleSAML\XML\URIElementTrait;
+use SimpleSAML\XML\SchemaValidatableElementInterface;
+use SimpleSAML\XML\SchemaValidatableElementTrait;
 
 /**
  * Empty shell class for testing URIElement.
  *
  * @package simplesaml/xml-common
  */
-final class URIElement extends AbstractElement
+final class URIElement extends AbstractElement implements SchemaValidatableElementInterface
 {
+    use SchemaValidatableElementTrait;
     use URIElementTrait;
 
     /** @var string */
@@ -22,6 +25,9 @@ final class URIElement extends AbstractElement
     /** @var string */
     public const NS_PREFIX = 'ssp';
 
+    /** @var string */
+    public const SCHEMA = 'tests/resources/schemas/simplesamlphp.xsd';
+
 
     /**
      * @param string $content

tests/XML/SchemaValidatableElementTraitTest.php

@@ -32,6 +32,16 @@ public function testSchemaValidationPasses(): void
     }
 
 
+    public function testSchemaValidationFails(): void
+    {
+        $file = 'tests/resources/xml/invalid_ExtendableElement.xml';
+        $chunk = DOMDocumentFactory::fromFile($file);
+
+        $this->expectException(SchemaViolationException::class);
+        $document = StringElement::schemaValidate($chunk);
+    }
+
+
     public function testSchemaValidationWrongElementFails(): void
     {
         $file = 'tests/resources/xml/ssp_Base64Element.xml';

tests/resources/schemas/simplesamlphp.xsd

@@ -47,6 +47,12 @@
 
 <!-- End StringElement -->
 
+<!-- Start URIElement -->
+
+<element name="URIElement" type="anyURI"/>
+
+<!-- End URIElement -->
+
 <!-- Start ExtendableAttributesElement -->
 
 <element name="ExtendableAttributesElement" type="ssp:ExtendableAttributesElementType"/>

tests/resources/xml/invalid_ExtendableElement.xml

@@ -0,0 +1,3 @@
+<ssp:ExtendableElement xmlns:ssp="urn:x-simplesamlphp:namespace">
+  <dummy:Chunk xmlns:dummy="urn:custom:dummy">some</dummy:Chunk>
+</ssp:ExtendableElement>