Raise coverage

Author: tvdijen

src/XML/sp_200507/Type/IncludeTokenValue.php

@@ -44,6 +44,15 @@ public function toAttribute(): XMLAttribute
     }
 
 
+    /**
+     * @return \SimpleSAML\WebServices\SecurityPolicy\XML\sp_200507\IncludeToken $value
+     */
+    public function toEnum(): IncludeToken
+    {
+        return IncludeToken::from($this->getValue());
+    }
+
+
     /**
      * @param \SimpleSAML\WebServices\SecurityPolicy\XML\sp_200507\IncludeToken $value
      * @return static

src/XML/sp_200507/Type/XPathValue.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\WebServices\SecurityPolicy\XML\sp_200507\Type;
+
+use DOMNodeList;
+use DOMXPath;
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSchema\Type\StringValue;
+
+/**
+ * @package simplesaml/xml-ws-security-policy
+ */
+class XPathValue extends StringValue
+{
+    /**
+     * Validate the content of the element.
+     *
+     * @throws \SimpleSAML\Assert\AssertionFailedException on failure
+     */
+    protected function validateValue(string $content): void
+    {
+        $dom = new DOMXPath(DOMDocumentFactory::create());
+        $result = $dom->evaluate($content);
+        Assert::isInstanceOf($result, DOMNodeList::class);
+    }
+}

src/XML/sp_200507/XPath.php

@@ -4,12 +4,8 @@
 
 namespace SimpleSAML\WebServices\SecurityPolicy\XML\sp_200507;
 
-use DOMNodeList;
-use DOMXPath;
-use SimpleSAML\WebServices\SecurityPolicy\Assert\Assert;
-use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200507\Type\XPathValue;
 use SimpleSAML\XML\TypedTextContentTrait;
-use SimpleSAML\XMLSchema\Type\StringValue;
 
 /**
  * An XPath element
@@ -21,18 +17,5 @@ final class XPath extends AbstractSpElement
     use TypedTextContentTrait;
 
 
-    public const string TEXTCONTENT_TYPE = StringValue::class;
-
-
-    /**
-     * Validate the content of the element.
-     *
-     * @throws \SimpleSAML\XMLSchema\Exception\SchemaViolationException on failure
-     */
-    protected function validateContent(string $content): void
-    {
-        $dom = new DOMXPath(DOMDocumentFactory::create());
-        $result = $dom->evaluate($content);
-        Assert::isInstanceOf($result, DOMNodeList::class);
-    }
+    public const string TEXTCONTENT_TYPE = XPathValue::class;
 }

src/XML/sp_200702/Type/IncludeTokenValue.php

@@ -42,6 +42,15 @@ public function toAttribute(): XMLAttribute
     }
 
 
+    /**
+     * @return \SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702\IncludeToken $value
+     */
+    public function toEnum(): IncludeToken
+    {
+        return IncludeToken::from($this->getValue());
+    }
+
+
     /**
      * @param \SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702\IncludeToken $value
      * @return static

src/XML/sp_200702/Type/XPathValue.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702\Type;
+
+use DOMNodeList;
+use DOMXPath;
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSchema\Type\StringValue;
+
+/**
+ * @package simplesaml/xml-ws-security-policy
+ */
+class XPathValue extends StringValue
+{
+    /**
+     * Validate the content of the element.
+     *
+     * @throws \SimpleSAML\Assert\AssertionFailedException on failure
+     */
+    protected function validateValue(string $content): void
+    {
+        $dom = new DOMXPath(DOMDocumentFactory::create());
+        $result = $dom->evaluate($content);
+        Assert::isInstanceOf($result, DOMNodeList::class);
+    }
+}

src/XML/sp_200702/XPath.php

@@ -4,12 +4,8 @@
 
 namespace SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702;
 
-use DOMNodeList;
-use DOMXPath;
-use SimpleSAML\WebServices\SecurityPolicy\Assert\Assert;
-use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702\Type\XPathValue;
 use SimpleSAML\XML\TypedTextContentTrait;
-use SimpleSAML\XMLSchema\Type\StringValue;
 
 /**
  * An XPath element
@@ -21,18 +17,5 @@ final class XPath extends AbstractSpElement
     use TypedTextContentTrait;
 
 
-    public const string TEXTCONTENT_TYPE = StringValue::class;
-
-
-    /**
-     * Validate the content of the element.
-     *
-     * @throws \SimpleSAML\XMLSchema\Exception\SchemaViolationException on failure
-     */
-    protected function validateContent(string $content): void
-    {
-        $dom = new DOMXPath(DOMDocumentFactory::create());
-        $result = $dom->evaluate($content);
-        Assert::isInstanceOf($result, DOMNodeList::class);
-    }
+    public const string TEXTCONTENT_TYPE = XPathValue::class;
 }

tests/SecurityPolicy/XML/sp_200507/Type/IncludeTokenValueTest.php

@@ -57,6 +57,16 @@ public function testToAttribute(): void
     }
 
 
+    public function testFromEnum(): void
+    {
+        $x = IncludeTokenValue::fromEnum(IncludeToken::Always);
+        $this->assertEquals(IncludeToken::Always, $x->toEnum());
+
+        $y = IncludeTokenValue::fromString(IncludeToken::Always->value);
+        $this->assertEquals(IncludeToken::Always, $y->toEnum());
+    }
+
+
     /**
 =======
 >>>>>>> cca25c1 (Fix namespaced IncludeToken-attribute (both sp-versions and coverage))

tests/SecurityPolicy/XML/sp_200702/Type/IncludeTokenValueTest.php

@@ -57,6 +57,16 @@ public function testToAttribute(): void
     }
 
 
+    public function testFromEnum(): void
+    {
+        $x = IncludeTokenValue::fromEnum(IncludeToken::Always);
+        $this->assertEquals(IncludeToken::Always, $x->toEnum());
+
+        $y = IncludeTokenValue::fromString(IncludeToken::Always->value);
+        $this->assertEquals(IncludeToken::Always, $y->toEnum());
+    }
+
+
     /**
 =======
 >>>>>>> cca25c1 (Fix namespaced IncludeToken-attribute (both sp-versions and coverage))