Implement remaining elements

composer.json

@@ -31,7 +31,7 @@
         "ext-spl": "*",
 
         "simplesamlphp/assert": "~1.8.1",
-        "simplesamlphp/xml-common": "dev-feature/xsd-types"
+        "simplesamlphp/xml-common": "dev-master"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "~1.9.2"

src/Exception/ProtocolViolationException.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XSD\Exception;
+
+/**
+ * This exception may be raised when a violation of the XML Schema specification is detected
+ *
+ * @package simplesamlphp/xml-xsd
+ */
+class ProtocolViolationException extends RuntimeException
+{
+}

src/Exception/RuntimeException.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XSD\Exception;
+
+use RuntimeException as BuiltinRuntimeException;
+
+/**
+ * Named exception
+ */
+class RuntimeException extends BuiltinRuntimeException
+{
+}

src/Type/AbstractAllNNIValue.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XSD\Type;
+
+use SimpleSAML\XML\Assert\Assert;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\Type\NonNegativeIntegerValue;
+
+/**
+ * @package simplesaml/xml-xsd
+ */
+abstract class AbstractAllNNIValue extends NonNegativeIntegerValue
+{
+    /**
+     * Validate the value.
+     *
+     * @param string $value  The value
+     * @throws \Exception on failure
+     * @return void
+     */
+    protected function validateValue(string $value): void
+    {
+        $sanitized = $this->sanitizeValue($value);
+        if ($sanitized !== 'unbounded') {
+            Assert::validNonNegativeInteger($sanitized, SchemaViolationException::class);
+        }
+    }
+}

src/Type/BlockSetValue.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XSD\Type;
+
+use SimpleSAML\XML\Assert\Assert;
+use SimpleSAML\XML\Constants as C;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\Type\NMTokenValue;
+// use SimpleSAML\XSD\XML\xsd\NameSpaceEnum;
+use SimpleSAML\XSD\XML\xsd\DerivationControlEnum;
+
+use function explode;
+
+/**
+ * @package simplesaml/xml-xsd
+ */
+class BlockSetValue extends NMTokenValue
+{
+    /** @var string */
+    public const SCHEMA_TYPE = 'blockSet';
+
+
+    /**
+     * Validate the value.
+     *
+     * @param string $value  The value
+     * @throws \Exception on failure
+     * @return void
+     */
+    protected function validateValue(string $value): void
+    {
+        $sanitized = $this->sanitizeValue($value);
+
+        if ($sanitized !== '#all' && $sanitized !== '') {
+//        if ($sanitized !== NamespaceEnum::Any && $sanitized !== '') {
+            $list = explode(' ', $sanitized, C::UNBOUNDED_LIMIT);
+
+            // After filtering the allowed values, there should be nothing left
+            $filtered = array_diff(
+                $list,
+                [
+                    DerivationControlEnum::Extension->value,
+                    DerivationControlEnum::Restriction->value,
+                    DerivationControlEnum::Substitution->value,
+                ],
+            );
+            Assert::isEmpty($filtered, SchemaViolationException::class);
+        }
+    }
+}

src/Type/DerivationControlValue.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XSD\Type;
+
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\Type\NMTokenValue;
+use SimpleSAML\XSD\XML\xsd\DerivationControlEnum;
+
+use function array_column;
+
+/**
+ * @package simplesaml/xml-xsd
+ */
+class DerivationControlValue extends NMTokenValue
+{
+    /**
+     * Validate the value.
+     *
+     * @param string $value  The value
+     * @throws \Exception on failure
+     * @return void
+     */
+    protected function validateValue(string $value): void
+    {
+        Assert::oneOf(
+            $this->sanitizeValue($value),
+            array_column(DerivationControlEnum::cases(), 'value'),
+            SchemaViolationException::class,
+        );
+    }
+
+
+    /**
+     * @param \SimpleSAML\XSD\XML\xsd\DerivationControlEnum $value
+     * @return static
+     */
+    public static function fromEnum(DerivationControlEnum $value): static
+    {
+        return new static($value->value);
+    }
+
+
+    /**
+     * @return \SimpleSAML\XSD\XML\xsd\DerivationControlEnum $value
+     */
+    public function toEnum(): DerivationControlEnum
+    {
+        return DerivationControlEnum::from($this->getValue());
+    }
+}

src/Type/DerivationSetValue.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XSD\Type;
+
+use SimpleSAML\XML\Assert\Assert;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XSD\XML\xsd\DerivationControlEnum;
+
+use function array_column;
+use function explode;
+
+/**
+ * @package simplesaml/xml-xsd
+ */
+class DerivationSetValue extends DerivationControlValue
+{
+    /** @var string */
+    public const SCHEMA_TYPE = 'derivationSet';
+
+
+    /**
+     * Validate the value.
+     *
+     * @param string $value  The value
+     * @throws \Exception on failure
+     * @return void
+     */
+    protected function validateValue(string $value): void
+    {
+        $sanitized = $this->sanitizeValue($value);
+
+        if ($sanitized !== '#all' && $sanitized !== '') {
+            Assert::allOneOf(
+                explode(' ', $sanitized),
+                array_column(
+                    [
+                        DerivationControlEnum::Extension,
+                        DerivationControlEnum::Restriction,
+                    ],
+                    'value',
+                ),
+                SchemaViolationException::class,
+            );
+        }
+    }
+}

src/Type/FormChoiceValue.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XSD\Type;
+
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\Type\NMTokenValue;
+use SimpleSAML\XSD\XML\xsd\FormChoiceEnum;
+
+use function array_column;
+
+/**
+ * @package simplesaml/xml-xsd
+ */
+class FormChoiceValue extends NMTokenValue
+{
+    /**
+     * Validate the value.
+     *
+     * @param string $value  The value
+     * @throws \Exception on failure
+     * @return void
+     */
+    protected function validateValue(string $value): void
+    {
+        Assert::oneOf(
+            $this->sanitizeValue($value),
+            array_column(FormChoiceEnum::cases(), 'value'),
+            SchemaViolationException::class,
+        );
+    }
+
+
+    /**
+     * @param \SimpleSAML\XSD\XML\xsd\FormChoiceEnum $value
+     * @return static
+     */
+    public static function fromEnum(FormChoiceEnum $value): static
+    {
+        return new static($value->value);
+    }
+
+
+    /**
+     * @return \SimpleSAML\XSD\XML\xsd\FormChoiceEnum $value
+     */
+    public function toEnum(): FormChoiceEnum
+    {
+        return FormChoiceEnum::from($this->getValue());
+    }
+}

src/Type/FullDerivationSetValue.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XSD\Type;
+
+use SimpleSAML\XML\Assert\Assert;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XSD\XML\xsd\DerivationControlEnum;
+
+use function array_column;
+use function explode;
+
+/**
+ * @package simplesaml/xml-xsd
+ */
+class FullDerivationSetValue extends DerivationControlValue
+{
+    /** @var string */
+    public const SCHEMA_TYPE = 'fullDerivationSet';
+
+
+    /**
+     * Validate the value.
+     *
+     * @param string $value  The value
+     * @throws \Exception on failure
+     * @return void
+     */
+    protected function validateValue(string $value): void
+    {
+        $sanitized = $this->sanitizeValue($value);
+
+        if ($sanitized !== '#all' && $sanitized !== '') {
+            Assert::allOneOf(
+                explode(' ', $sanitized),
+                array_column(
+                    [
+                        DerivationControlEnum::Extension,
+                        DerivationControlEnum::List,
+                        DerivationControlEnum::Restriction,
+                        DerivationControlEnum::Union,
+                    ],
+                    'value',
+                ),
+                SchemaViolationException::class,
+            );
+        }
+    }
+}

src/Type/MaxOccursValue.php

@@ -4,31 +4,11 @@
 
 namespace SimpleSAML\XSD\Type;
 
-use SimpleSAML\XML\Assert\Assert;
-use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XML\Type\NonNegativeIntegerValue;
-
 /**
  * @package simplesaml/xml-xsd
  */
-class MaxOccursValue extends NonNegativeIntegerValue
+class MaxOccursValue extends AbstractAllNNIValue
 {
     /** @var string */
     public const SCHEMA_TYPE = 'maxOccurs';
-
-
-    /**
-     * Validate the value.
-     *
-     * @param string $value  The value
-     * @throws \Exception on failure
-     * @return void
-     */
-    protected function validateValue(string $value): void
-    {
-        $sanitized = $this->sanitizeValue($value);
-        if ($sanitized !== 'unbounded') {
-            Assert::validNonNegativeInteger($sanitized, SchemaViolationException::class);
-        }
-    }
 }