Revert unjust const>enum convertion

tvdijen · tvdijen · commit f6ab89056692 · 2025-09-23T21:02:08.000+02:00
diff --git a/composer.json b/composer.json
@@ -43,11 +43,11 @@
         "ext-pcre": "*",
         "ext-spl": "*",
 
-        "simplesamlphp/assert": "~1.8.1",
-        "simplesamlphp/xml-common": "~2.0.1"
+        "simplesamlphp/assert": "~1.9.0",
+        "simplesamlphp/xml-common": "~2.0.2"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "~1.9.2"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.10.2"
     },
     "config": {
         "allow-plugins": {
diff --git a/src/TestUtils/SignedElementTestTrait.php b/src/TestUtils/SignedElementTestTrait.php
@@ -29,6 +29,7 @@
  * you are testing to the $testedClass property.
  *
  * @package simplesamlphp/xml-security
+ * @phpstan-ignore trait.unused
  */
 trait SignedElementTestTrait
 {
diff --git a/src/XML/EncryptableElementTrait.php b/src/XML/EncryptableElementTrait.php
@@ -17,6 +17,7 @@
  * Trait aggregating functionality for elements that can be encrypted.
  *
  * @package simplesamlphp/xml-security
+ * @phpstan-ignore trait.unused
  */
 trait EncryptableElementTrait
 {
diff --git a/src/XML/EncryptedElementTrait.php b/src/XML/EncryptedElementTrait.php
@@ -26,6 +26,7 @@
  * Trait aggregating functionality for encrypted elements.
  *
  * @package simplesamlphp/xml-security
+ * @phpstan-ignore trait.unused
  */
 trait EncryptedElementTrait
 {
diff --git a/src/XML/SignableElementTrait.php b/src/XML/SignableElementTrait.php
@@ -35,6 +35,7 @@
  * Trait SignableElementTrait
  *
  * @package simplesamlphp/xml-security
+ * @phpstan-ignore trait.unused
  */
 trait SignableElementTrait
 {
diff --git a/src/XML/SignedElementTrait.php b/src/XML/SignedElementTrait.php
@@ -40,6 +40,7 @@
  * Helper trait for processing signed elements.
  *
  * @package simplesamlphp/xml-security
+ * @phpstan-ignore trait.unused
  */
 trait SignedElementTrait
 {
diff --git a/src/XML/ds/AbstractKeyInfoType.php b/src/XML/ds/AbstractKeyInfoType.php
@@ -9,7 +9,7 @@
 use SimpleSAML\XML\SerializableElementInterface;
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 use SimpleSAML\XMLSchema\Type\IDValue;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
@@ -27,8 +27,8 @@ abstract class AbstractKeyInfoType extends AbstractDsElement
 {
     use ExtendableElementTrait;
 
-    /** @var \SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    /** @var string */
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/ds/AbstractPGPDataType.php b/src/XML/ds/AbstractPGPDataType.php
@@ -9,7 +9,7 @@
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, SchemaViolationException, TooManyElementsException};
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
 
 use function array_pop;
@@ -24,8 +24,8 @@ abstract class AbstractPGPDataType extends AbstractDsElement implements SchemaVa
     use ExtendableElementTrait;
     use SchemaValidatableElementTrait;
 
-    /** @var \SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    /** @var string */
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/ds/DigestMethod.php b/src/XML/ds/DigestMethod.php
@@ -10,7 +10,7 @@
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, SchemaViolationException};
 use SimpleSAML\XMLSchema\Type\AnyURIValue;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
@@ -27,7 +27,7 @@ final class DigestMethod extends AbstractDsElement implements SchemaValidatableE
     use SchemaValidatableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
     /**
      * Initialize a DigestMethod element.
diff --git a/src/XML/ds/DsObject.php b/src/XML/ds/DsObject.php
@@ -9,7 +9,7 @@
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
 use SimpleSAML\XMLSchema\Type\{AnyURIValue, IDValue, StringValue};
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 
 use function strval;
@@ -27,8 +27,8 @@ final class DsObject extends AbstractDsElement implements SchemaValidatableEleme
     /** @var string */
     public const LOCALNAME = 'Object';
 
-    /** @var \SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Any;
+    /** @var string */
+    public const XS_ANY_ELT_NAMESPACE = NS::ANY;
 
 
     /**
diff --git a/src/XML/ds/KeyValue.php b/src/XML/ds/KeyValue.php
@@ -11,7 +11,7 @@
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XML\SerializableElementInterface;
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, SchemaViolationException, TooManyElementsException};
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\XML\dsig11\ECKeyValue;
 
@@ -34,7 +34,7 @@ final class KeyValue extends AbstractDsElement implements SchemaValidatableEleme
 
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/ds/SignatureMethod.php b/src/XML/ds/SignatureMethod.php
@@ -10,7 +10,7 @@
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, SchemaViolationException, TooManyElementsException};
 use SimpleSAML\XMLSchema\Type\AnyURIValue;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
@@ -30,7 +30,7 @@ final class SignatureMethod extends AbstractDsElement implements SchemaValidatab
     use SchemaValidatableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/ds/SignatureProperty.php b/src/XML/ds/SignatureProperty.php
@@ -9,7 +9,7 @@
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, MissingElementException, SchemaViolationException};
 use SimpleSAML\XMLSchema\Type\{AnyURIValue, IDValue};
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 
 use function strval;
@@ -25,7 +25,7 @@ final class SignatureProperty extends AbstractDsElement implements SchemaValidat
     use SchemaValidatableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/ds/SignatureValue.php b/src/XML/ds/SignatureValue.php
@@ -49,7 +49,7 @@ public function getId(): ?IDValue
      *
      * @return \SimpleSAML\XMLSchema\Type\Base64BinaryValue
      */
-    public function getValue(): ?Base64BinaryValue
+    public function getValue(): Base64BinaryValue
     {
         return $this->value;
     }
diff --git a/src/XML/ds/X509Data.php b/src/XML/ds/X509Data.php
@@ -9,7 +9,7 @@
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait, SerializableElementInterface};
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\{InvalidArgumentException, ProtocolViolationException};
 use SimpleSAML\XMLSecurity\XML\dsig11\X509Digest;
@@ -25,7 +25,7 @@ final class X509Data extends AbstractDsElement implements SchemaValidatableEleme
     use SchemaValidatableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
     /** The exclusions for the xs:any element */
     public const XS_ANY_ELT_EXCLUSIONS = [
diff --git a/src/XML/dsig11/AbstractFieldIDType.php b/src/XML/dsig11/AbstractFieldIDType.php
@@ -8,7 +8,7 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\{Chunk, ExtendableElementTrait, SerializableElementInterface};
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\Constants as C;
 
 /**
@@ -24,8 +24,8 @@ abstract class AbstractFieldIDType extends AbstractDsig11Element
         setElements as private;
     }
 
-    /** @var \SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    /** @var string */
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/dsig11/DEREncodedKeyValue.php b/src/XML/dsig11/DEREncodedKeyValue.php
@@ -42,7 +42,7 @@ public function __construct(
      *
      * @return \SimpleSAML\XMLSchema\Type\Base64BinaryValue
      */
-    public function getValue(): ?Base64BinaryValue
+    public function getValue(): Base64BinaryValue
     {
         return $this->value;
     }
diff --git a/src/XML/xenc/AbstractAgreementMethodType.php b/src/XML/xenc/AbstractAgreementMethodType.php
@@ -9,7 +9,7 @@
 use SimpleSAML\XML\{ExtendableElementTrait, SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, SchemaViolationException, TooManyElementsException};
 use SimpleSAML\XMLSchema\Type\AnyURIValue;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 
 use function array_pop;
 use function strval;
@@ -25,7 +25,7 @@ abstract class AbstractAgreementMethodType extends AbstractXencElement implement
     use SchemaValidatableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/xenc/AbstractEncryptionMethod.php b/src/XML/xenc/AbstractEncryptionMethod.php
@@ -9,7 +9,7 @@
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, SchemaViolationException, TooManyElementsException};
 use SimpleSAML\XMLSchema\Type\AnyURIValue;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 
 use function array_pop;
 use function strval;
@@ -24,7 +24,7 @@ abstract class AbstractEncryptionMethod extends AbstractXencElement
     use ExtendableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/xenc/AbstractEncryptionPropertyType.php b/src/XML/xenc/AbstractEncryptionPropertyType.php
@@ -10,7 +10,7 @@
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, MissingElementException, SchemaViolationException};
 use SimpleSAML\XMLSchema\Type\{AnyURIValue, IDValue};
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 
 use function strval;
@@ -31,7 +31,7 @@ abstract class AbstractEncryptionPropertyType extends AbstractXencElement implem
     public const XS_ANY_ATTR_NAMESPACE = [C::NS_XML];
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/xenc/AbstractReference.php b/src/XML/xenc/AbstractReference.php
@@ -9,7 +9,7 @@
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, SchemaViolationException};
 use SimpleSAML\XMLSchema\Type\AnyURIValue;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 
 use function strval;
 
@@ -23,7 +23,7 @@ abstract class AbstractReference extends AbstractXencElement
     use ExtendableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Other;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/xenc11/AbstractKeyDerivationMethodType.php b/src/XML/xenc11/AbstractKeyDerivationMethodType.php
@@ -10,7 +10,7 @@
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XMLSchema\Exception\{InvalidDOMElementException, SchemaViolationException};
 use SimpleSAML\XMLSchema\Type\AnyURIValue;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 
 use function strval;
 
@@ -26,7 +26,7 @@ abstract class AbstractKeyDerivationMethodType extends AbstractXenc11Element imp
     use SchemaValidatableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Any;
+    public const XS_ANY_ELT_NAMESPACE = NS::ANY;
 
 
     /**
diff --git a/src/XML/xenc11/Parameters.php b/src/XML/xenc11/Parameters.php
@@ -8,7 +8,7 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\{ExtendableAttributesTrait, ExtendableElementTrait};
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
-use SimpleSAML\XMLSchema\XML\Enumeration\NamespaceEnum;
+use SimpleSAML\XMLSchema\XML\Constants\NS;
 
 /**
  * Class representing xenc11:Parameters
@@ -21,10 +21,10 @@ final class Parameters extends AbstractXenc11Element
     use ExtendableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = NamespaceEnum::Any;
+    public const XS_ANY_ELT_NAMESPACE = NS::ANY;
 
     /** The namespace-attribute for the xs:anyAttribute element */
-    public const XS_ANY_ATTR_NAMESPACE = NamespaceEnum::Any;
+    public const XS_ANY_ATTR_NAMESPACE = NS::ANY;
 
 
     /**
diff --git a/tests/CryptoEncoding/PEMBundleTest.php b/tests/CryptoEncoding/PEMBundleTest.php
@@ -49,6 +49,7 @@ public function testBundle(): PEMBundle
     #[Depends('testBundle')]
     public function testAll(PEMBundle $bundle): void
     {
+        // @phpstan-ignore method.alreadyNarrowedType
         $this->assertContainsOnlyInstancesOf(PEM::class, $bundle->all());
     }
 
@@ -95,6 +96,7 @@ public function testIterator(PEMBundle $bundle): void
         foreach ($bundle as $pem) {
             $values[] = $pem;
         }
+        // @phpstan-ignore method.alreadyNarrowedType
         $this->assertContainsOnlyInstancesOf(PEM::class, $values);
     }
 
@@ -105,6 +107,7 @@ public function testIterator(PEMBundle $bundle): void
     #[Depends('testBundle')]
     public function testString(PEMBundle $bundle): void
     {
+        // @phpstan-ignore method.alreadyNarrowedType
         $this->assertIsString($bundle->string());
     }
 
@@ -115,6 +118,7 @@ public function testString(PEMBundle $bundle): void
     #[Depends('testBundle')]
     public function testToString(PEMBundle $bundle): void
     {
+        // @phpstan-ignore method.alreadyNarrowedType
         $this->assertIsString(strval($bundle));
     }
 
diff --git a/tests/CryptoEncoding/PEMTest.php b/tests/CryptoEncoding/PEMTest.php
diff --git a/tests/XML/EncryptedCustom.php b/tests/XML/EncryptedCustom.php
diff --git a/tests/XML/ds/DSAKeyValueTest.php b/tests/XML/ds/DSAKeyValueTest.php
diff --git a/tests/XML/ds/PGPDataTest.php b/tests/XML/ds/PGPDataTest.php
diff --git a/tests/XML/ds/ReferenceTest.php b/tests/XML/ds/ReferenceTest.php
diff --git a/tests/XML/dsig11/PnBTest.php b/tests/XML/dsig11/PnBTest.php
diff --git a/tests/XML/dsig11/TnBTest.php b/tests/XML/dsig11/TnBTest.php
diff --git a/tests/XML/xenc/EncryptedKeyTest.php b/tests/XML/xenc/EncryptedKeyTest.php

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`* you are testing to the $testedClass property.`
`30`	`30`	`*`
`31`	`31`	`* @package simplesamlphp/xml-security`
	`32`	`+ * @phpstan-ignore trait.unused`
`32`	`33`	`*/`
`33`	`34`	`trait SignedElementTestTrait`
`34`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`* Trait aggregating functionality for elements that can be encrypted.`
`18`	`18`	`*`
`19`	`19`	`* @package simplesamlphp/xml-security`
	`20`	`+ * @phpstan-ignore trait.unused`
`20`	`21`	`*/`
`21`	`22`	`trait EncryptableElementTrait`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`* Trait aggregating functionality for encrypted elements.`
`27`	`27`	`*`
`28`	`28`	`* @package simplesamlphp/xml-security`
	`29`	`+ * @phpstan-ignore trait.unused`
`29`	`30`	`*/`
`30`	`31`	`trait EncryptedElementTrait`
`31`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`* Trait SignableElementTrait`
`36`	`36`	`*`
`37`	`37`	`* @package simplesamlphp/xml-security`
	`38`	`+ * @phpstan-ignore trait.unused`
`38`	`39`	`*/`
`39`	`40`	`trait SignableElementTrait`
`40`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`* Helper trait for processing signed elements.`
`41`	`41`	`*`
`42`	`42`	`* @package simplesamlphp/xml-security`
	`43`	`+ * @phpstan-ignore trait.unused`
`43`	`44`	`*/`
`44`	`45`	`trait SignedElementTrait`
`45`	`46`	`{`