s/DigestValueValue/DigestValueType and fix incorrect types used in un…

…it tests
simplesamlphp · Feb 2, 2025 · 709f0b5 · 709f0b5
1 parent 3c0068e
commit 709f0b5
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 51 deletions.
diff --git a/src/Type/DigestValueValue.php → src/Type/DigestValue.php b/src/Type/DigestValueValue.php → src/Type/DigestValue.php
@@ -11,7 +11,7 @@
 /**
  * @package simplesaml/xml-security
  */
-class DigestValueValue extends Base64BinaryValue
+class DigestValue extends Base64BinaryValue
 {
     /**
      * Validate the value.

diff --git a/src/XML/SignableElementTrait.php b/src/XML/SignableElementTrait.php
@@ -11,7 +11,7 @@
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmInterface;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\{RuntimeException, UnsupportedAlgorithmException};
-use SimpleSAML\XMLSecurity\Type\DigestValueValue;
+use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
 use SimpleSAML\XMLSecurity\Utils\XML;
 use SimpleSAML\XMLSecurity\XML\ds\{
     CanonicalizationMethod,
@@ -136,7 +136,7 @@ private function getReference(
                 AnyURIValue::fromString($digestAlg),
             ),
             new DigestValue(
-                DigestValueValue::fromString(
+                DigestValueType::fromString(
                     base64_encode(hash(C::$DIGEST_ALGORITHMS[$digestAlg], $canonicalDocument, true)),
                 ),
             ),

diff --git a/src/XML/ds/DigestValue.php b/src/XML/ds/DigestValue.php
@@ -6,7 +6,7 @@
 
 use SimpleSAML\XML\TypedTextContentTrait;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
-use SimpleSAML\XMLSecurity\Type\DigestValueValue;
+use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
 
 /**
  * Class representing a ds:DigestValue element.
@@ -19,5 +19,5 @@ final class DigestValue extends AbstractDsElement implements SchemaValidatableEl
     use TypedTextContentTrait;
 
     /** @var string */
-    public const TEXTCONTENT_TYPE = DigestValueValue::class;
+    public const TEXTCONTENT_TYPE = DigestValueType::class;
 }
diff --git a/tests/Type/DigestValueValueTest.php → tests/Type/DigestValueTest.php b/tests/Type/DigestValueValueTest.php → tests/Type/DigestValueTest.php
@@ -8,15 +8,15 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XMLSecurity\Type\DigestValueValue;
+use SimpleSAML\XMLSecurity\Type\DigestValue;
 
 /**
- * Class \SimpleSAML\Test\XMLSecurity\Type\DigestValueValueTest
+ * Class \SimpleSAML\Test\XMLSecurity\Type\DigestValueTest
  *
  * @package simplesamlphp/xml-security
  */
-#[CoversClass(DigestValueValue::class)]
-final class DigestValueValueTest extends TestCase
+#[CoversClass(DigestValue::class)]
+final class DigestValueTest extends TestCase
 {
     /**
      * @param boolean $shouldPass
@@ -26,7 +26,7 @@ final class DigestValueValueTest extends TestCase
     public function testDigestValue(bool $shouldPass, string $digestValue): void
     {
         try {
-            DigestValueValue::fromString($digestValue);
+            DigestValue::fromString($digestValue);
             $this->assertTrue($shouldPass);
         } catch (SchemaViolationException $e) {
             $this->assertFalse($shouldPass);

diff --git a/tests/XML/ds/DSAKeyValueTest.php b/tests/XML/ds/DSAKeyValueTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
-use SimpleSAML\XML\Type\Base64BinaryValue;
+use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
 use SimpleSAML\XMLSecurity\XML\ds\{AbstractDSAKeyValueType, AbstractDsElement, DSAKeyValue};
 use SimpleSAML\XMLSecurity\XML\ds\{G, J, P, PgenCounter, Q, Seed, Y};
 
@@ -46,25 +46,25 @@ public static function setUpBeforeClass(): void
     public function testMarshalling(): void
     {
         $p = new P(
-            Base64BinaryValue::fromString('GpM1'),
+            CryptoBinaryValue::fromString('GpM1'),
         );
         $q = new Q(
-            Base64BinaryValue::fromString('GpM2'),
+            CryptoBinaryValue::fromString('GpM2'),
         );
         $g = new G(
-            Base64BinaryValue::fromString('GpM3'),
+            CryptoBinaryValue::fromString('GpM3'),
         );
         $y = new Y(
-            Base64BinaryValue::fromString('GpM4'),
+            CryptoBinaryValue::fromString('GpM4'),
         );
         $j = new J(
-            Base64BinaryValue::fromString('GpM5'),
+            CryptoBinaryValue::fromString('GpM5'),
         );
         $seed = new Seed(
-            Base64BinaryValue::fromString('GpM6'),
+            CryptoBinaryValue::fromString('GpM6'),
         );
         $pgenCounter = new PgenCounter(
-            Base64BinaryValue::fromString('GpM7'),
+            CryptoBinaryValue::fromString('GpM7'),
         );
 
         $dsaKeyValue = new DSAKeyValue($y, $g, $j, $p, $q, $seed, $pgenCounter);
@@ -81,25 +81,25 @@ public function testMarshalling(): void
     public function testMarshallingElementOrder(): void
     {
         $p = new P(
-            Base64BinaryValue::fromString('GpM1'),
+            CryptoBinaryValue::fromString('GpM1'),
         );
         $q = new Q(
-            Base64BinaryValue::fromString('GpM2'),
+            CryptoBinaryValue::fromString('GpM2'),
         );
         $g = new G(
-            Base64BinaryValue::fromString('GpM3'),
+            CryptoBinaryValue::fromString('GpM3'),
         );
         $y = new Y(
-            Base64BinaryValue::fromString('GpM4'),
+            CryptoBinaryValue::fromString('GpM4'),
         );
         $j = new J(
-            Base64BinaryValue::fromString('GpM5'),
+            CryptoBinaryValue::fromString('GpM5'),
         );
         $seed = new Seed(
-            Base64BinaryValue::fromString('GpM6'),
+            CryptoBinaryValue::fromString('GpM6'),
         );
         $pgenCounter = new PgenCounter(
-            Base64BinaryValue::fromString('GpM7'),
+            CryptoBinaryValue::fromString('GpM7'),
         );
 
         $dsaKeyValue = new DSAKeyValue($y, $g, $j, $p, $q, $seed, $pgenCounter);

diff --git a/tests/XML/ds/DigestValueTest.php b/tests/XML/ds/DigestValueTest.php
@@ -9,7 +9,7 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
 use SimpleSAML\XMLSecurity\Test\XML\XMLDumper;
-use SimpleSAML\XMLSecurity\Type\DigestValueValue;
+use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
 use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, DigestValue};
 
 use function dirname;
@@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void
     public function testMarshalling(): void
     {
         $digestValue = new DigestValue(
-            DigestValueValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+            DigestValueType::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
         );
 
         $this->assertEquals(

diff --git a/tests/XML/ds/KeyInfoTest.php b/tests/XML/ds/KeyInfoTest.php
@@ -11,6 +11,7 @@
 use SimpleSAML\XML\Type\{Base64BinaryValue, IDValue, StringValue};
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
+use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
 use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, AbstractKeyInfoType, KeyInfo, KeyName, MgmtData};
 use SimpleSAML\XMLSecurity\XML\ds\{PGPData, PGPKeyID, PGPKeyPacket};
 use SimpleSAML\XMLSecurity\XML\ds\{SPKIData, SPKISexp};
@@ -87,7 +88,7 @@ public function testMarshalling(): void
             Base64BinaryValue::fromString('GpM6'),
         );
         $seed = new Seed(
-            Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+            CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
         );
         $SPKISexp2 = new SPKISexp(
             Base64BinaryValue::fromString('GpM7'),
@@ -123,7 +124,7 @@ public function testMarshalling(): void
                     ),
                     [
                         new P(
-                            Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                            CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
                         ),
                     ],
                 ),

diff --git a/tests/XML/ds/ManifestTest.php b/tests/XML/ds/ManifestTest.php
@@ -10,6 +10,7 @@
 use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
 use SimpleSAML\XML\Type\{AnyURIValue, Base64BinaryValue, IDValue};
 use SimpleSAML\XMLSecurity\Constants as C;
+use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
 use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, DigestMethod, DigestValue};
 use SimpleSAML\XMLSecurity\XML\ds\{Manifest, Reference, Transform, Transforms};
 
@@ -51,7 +52,7 @@ public function testMarshalling(): void
                 AnyURIValue::fromString(C::DIGEST_SHA256),
             ),
             new DigestValue(
-                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                DigestValueType::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
             new Transforms(
                 [

diff --git a/tests/XML/ds/PGPDataTest.php b/tests/XML/ds/PGPDataTest.php
@@ -10,6 +10,7 @@
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
 use SimpleSAML\XML\Type\Base64BinaryValue;
+use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
 use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, AbstractPGPDataType};
 use SimpleSAML\XMLSecurity\XML\ds\{PGPData, PGPKeyID, PGPKeyPacket};
 use SimpleSAML\XMLSecurity\XML\xenc\P;
@@ -54,7 +55,7 @@ public static function setUpBeforeClass(): void
         );
 
         self::$p = new P(
-            Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+            CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
         );
     }
 

diff --git a/tests/XML/ds/RSAKeyValueTest.php b/tests/XML/ds/RSAKeyValueTest.php
@@ -8,8 +8,8 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
-use SimpleSAML\XML\Type\Base64BinaryValue;
 use SimpleSAML\XML\Utils\XPath;
+use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
 use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, Exponent, Modulus, RSAKeyValue};
 
 use function dirname;
@@ -42,10 +42,10 @@ public static function setUpBeforeClass(): void
 
         self::$rsaKeyValue = new RSAKeyValue(
             new Modulus(
-                Base64BinaryValue::fromString('dGhpcyBpcyBzb21lIHJhbmRvbSBtb2R1bHVzCg=='),
+                CryptoBinaryValue::fromString('dGhpcyBpcyBzb21lIHJhbmRvbSBtb2R1bHVzCg=='),
             ),
             new Exponent(
-                Base64BinaryValue::fromString('dGhpcyBpcyBzb21lIHJhbmRvbSBleHBvbmVudAo='),
+                CryptoBinaryValue::fromString('dGhpcyBpcyBzb21lIHJhbmRvbSBleHBvbmVudAo='),
             ),
         );
     }

diff --git a/tests/XML/ds/ReferenceTest.php b/tests/XML/ds/ReferenceTest.php
@@ -10,6 +10,7 @@
 use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
 use SimpleSAML\XML\Type\{AnyURIValue, Base64BinaryValue, IDValue};
 use SimpleSAML\XMLSecurity\Constants as C;
+use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
 use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, DigestMethod, DigestValue};
 use SimpleSAML\XMLSecurity\XML\ds\{Reference, Transform, Transforms};
 
@@ -50,7 +51,7 @@ public function testMarshalling(): void
                 AnyURIValue::fromString(C::DIGEST_SHA256),
             ),
             new DigestValue(
-                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                DigestValueType::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
             new Transforms(
                 [
@@ -84,7 +85,7 @@ public function testMarshallingReferenceElementOrdering(): void
                 AnyURIValue::fromString(C::DIGEST_SHA256),
             ),
             new DigestValue(
-                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                DigestValueType::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
             new Transforms(
                 [

diff --git a/tests/XML/ds/SPKIDataTest.php b/tests/XML/ds/SPKIDataTest.php
@@ -9,6 +9,7 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
 use SimpleSAML\XML\Type\{Base64BinaryValue, StringValue};
+use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
 use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, AbstractSPKIDataType};
 use SimpleSAML\XMLSecurity\XML\ds\{SPKIData, SPKISexp};
 use SimpleSAML\XMLSecurity\XML\xenc\{CarriedKeyName, Seed};
@@ -50,7 +51,7 @@ public function testMarshalling(): void
             Base64BinaryValue::fromString('GpM6'),
         );
         $seed = new Seed(
-            Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+            CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
         );
         $SPKISexp2 = new SPKISexp(
             Base64BinaryValue::fromString('GpM7'),

diff --git a/tests/XML/xenc/DHKeyValueTest.php b/tests/XML/xenc/DHKeyValueTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
-use SimpleSAML\XML\Type\Base64BinaryValue;
+use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
 use SimpleSAML\XMLSecurity\Utils\XPath;
 use SimpleSAML\XMLSecurity\XML\xenc\{
     AbstractDHKeyValueType,
@@ -57,22 +57,22 @@ public static function setUpBeforeClass(): void
 
         self::$dhKeyValue = new DHKeyValue(
             new XencPublic(
-                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
             new P(
-                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
             new Q(
-                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
             new Generator(
-                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
             new Seed(
-                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
             new PgenCounter(
-                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
         );
     }

diff --git a/tests/XML/xenc/OriginatorKeyInfoTest.php b/tests/XML/xenc/OriginatorKeyInfoTest.php
@@ -12,6 +12,7 @@
 use SimpleSAML\XML\Type\{Base64BinaryValue, IDValue, StringValue};
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
+use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
 use SimpleSAML\XMLSecurity\XML\ds\{
     AbstractDsElement,
     AbstractKeyInfoType,
@@ -97,7 +98,7 @@ public function testMarshalling(): void
             Base64BinaryValue::fromString('GpM6'),
         );
         $seed = new Seed(
-            Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+            CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
         );
         $SPKISexp2 = new SPKISexp(
             Base64BinaryValue::fromString('GpM7'),
@@ -133,7 +134,7 @@ public function testMarshalling(): void
                     ),
                     [
                         new P(
-                            Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                            CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
                         ),
                     ],
                 ),

diff --git a/tests/XML/xenc/RecipientKeyInfoTest.php b/tests/XML/xenc/RecipientKeyInfoTest.php
@@ -11,6 +11,7 @@
 use SimpleSAML\XML\Type\{Base64BinaryValue, IDValue, StringValue};
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
+use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
 use SimpleSAML\XMLSecurity\XML\ds\{
     AbstractDsElement,
     AbstractKeyInfoType,
@@ -96,7 +97,7 @@ public function testMarshalling(): void
             Base64BinaryValue::fromString('GpM6'),
         );
         $seed = new Seed(
-            Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+            CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
         );
         $SPKISexp2 = new SPKISexp(
             Base64BinaryValue::fromString('GpM7'),
@@ -132,7 +133,7 @@ public function testMarshalling(): void
                     ),
                     [
                         new P(
-                            Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
+                            CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
                         ),
                     ],
                 ),