Skip to content

Commit 709f0b5

Browse files
tvdijentvdijen
committed
s/DigestValueValue/DigestValueType and fix incorrect types used in unit tests
1 parent 3c0068e commit 709f0b5

16 files changed

+59
-51
lines changed

‎src/Type/DigestValueValue.php‎ renamed to ‎src/Type/DigestValue.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* @package simplesaml/xml-security
1313
*/
14-
class DigestValueValue extends Base64BinaryValue
14+
class DigestValue extends Base64BinaryValue
1515
{
1616
/**
1717
* Validate the value.

‎src/XML/SignableElementTrait.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmInterface;
1212
use SimpleSAML\XMLSecurity\Constants as C;
1313
use SimpleSAML\XMLSecurity\Exception\{RuntimeException, UnsupportedAlgorithmException};
14-
use SimpleSAML\XMLSecurity\Type\DigestValueValue;
14+
use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
1515
use SimpleSAML\XMLSecurity\Utils\XML;
1616
use SimpleSAML\XMLSecurity\XML\ds\{
1717
CanonicalizationMethod,
@@ -136,7 +136,7 @@ private function getReference(
136136
AnyURIValue::fromString($digestAlg),
137137
),
138138
new DigestValue(
139-
DigestValueValue::fromString(
139+
DigestValueType::fromString(
140140
base64_encode(hash(C::$DIGEST_ALGORITHMS[$digestAlg], $canonicalDocument, true)),
141141
),
142142
),

‎src/XML/ds/DigestValue.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use SimpleSAML\XML\TypedTextContentTrait;
88
use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
9-
use SimpleSAML\XMLSecurity\Type\DigestValueValue;
9+
use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
1010

1111
/**
1212
* Class representing a ds:DigestValue element.
@@ -19,5 +19,5 @@ final class DigestValue extends AbstractDsElement implements SchemaValidatableEl
1919
use TypedTextContentTrait;
2020

2121
/** @var string */
22-
public const TEXTCONTENT_TYPE = DigestValueValue::class;
22+
public const TEXTCONTENT_TYPE = DigestValueType::class;
2323
}

‎tests/Type/DigestValueValueTest.php‎ renamed to ‎tests/Type/DigestValueTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
use PHPUnit\Framework\Attributes\DataProvider;
99
use PHPUnit\Framework\TestCase;
1010
use SimpleSAML\XML\Exception\SchemaViolationException;
11-
use SimpleSAML\XMLSecurity\Type\DigestValueValue;
11+
use SimpleSAML\XMLSecurity\Type\DigestValue;
1212

1313
/**
14-
* Class \SimpleSAML\Test\XMLSecurity\Type\DigestValueValueTest
14+
* Class \SimpleSAML\Test\XMLSecurity\Type\DigestValueTest
1515
*
1616
* @package simplesamlphp/xml-security
1717
*/
18-
#[CoversClass(DigestValueValue::class)]
19-
final class DigestValueValueTest extends TestCase
18+
#[CoversClass(DigestValue::class)]
19+
final class DigestValueTest extends TestCase
2020
{
2121
/**
2222
* @param boolean $shouldPass
@@ -26,7 +26,7 @@ final class DigestValueValueTest extends TestCase
2626
public function testDigestValue(bool $shouldPass, string $digestValue): void
2727
{
2828
try {
29-
DigestValueValue::fromString($digestValue);
29+
DigestValue::fromString($digestValue);
3030
$this->assertTrue($shouldPass);
3131
} catch (SchemaViolationException $e) {
3232
$this->assertFalse($shouldPass);

‎tests/XML/ds/DSAKeyValueTest.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use PHPUnit\Framework\TestCase;
99
use SimpleSAML\XML\DOMDocumentFactory;
1010
use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
11-
use SimpleSAML\XML\Type\Base64BinaryValue;
11+
use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
1212
use SimpleSAML\XMLSecurity\XML\ds\{AbstractDSAKeyValueType, AbstractDsElement, DSAKeyValue};
1313
use SimpleSAML\XMLSecurity\XML\ds\{G, J, P, PgenCounter, Q, Seed, Y};
1414

@@ -46,25 +46,25 @@ public static function setUpBeforeClass(): void
4646
public function testMarshalling(): void
4747
{
4848
$p = new P(
49-
Base64BinaryValue::fromString('GpM1'),
49+
CryptoBinaryValue::fromString('GpM1'),
5050
);
5151
$q = new Q(
52-
Base64BinaryValue::fromString('GpM2'),
52+
CryptoBinaryValue::fromString('GpM2'),
5353
);
5454
$g = new G(
55-
Base64BinaryValue::fromString('GpM3'),
55+
CryptoBinaryValue::fromString('GpM3'),
5656
);
5757
$y = new Y(
58-
Base64BinaryValue::fromString('GpM4'),
58+
CryptoBinaryValue::fromString('GpM4'),
5959
);
6060
$j = new J(
61-
Base64BinaryValue::fromString('GpM5'),
61+
CryptoBinaryValue::fromString('GpM5'),
6262
);
6363
$seed = new Seed(
64-
Base64BinaryValue::fromString('GpM6'),
64+
CryptoBinaryValue::fromString('GpM6'),
6565
);
6666
$pgenCounter = new PgenCounter(
67-
Base64BinaryValue::fromString('GpM7'),
67+
CryptoBinaryValue::fromString('GpM7'),
6868
);
6969

7070
$dsaKeyValue = new DSAKeyValue($y, $g, $j, $p, $q, $seed, $pgenCounter);
@@ -81,25 +81,25 @@ public function testMarshalling(): void
8181
public function testMarshallingElementOrder(): void
8282
{
8383
$p = new P(
84-
Base64BinaryValue::fromString('GpM1'),
84+
CryptoBinaryValue::fromString('GpM1'),
8585
);
8686
$q = new Q(
87-
Base64BinaryValue::fromString('GpM2'),
87+
CryptoBinaryValue::fromString('GpM2'),
8888
);
8989
$g = new G(
90-
Base64BinaryValue::fromString('GpM3'),
90+
CryptoBinaryValue::fromString('GpM3'),
9191
);
9292
$y = new Y(
93-
Base64BinaryValue::fromString('GpM4'),
93+
CryptoBinaryValue::fromString('GpM4'),
9494
);
9595
$j = new J(
96-
Base64BinaryValue::fromString('GpM5'),
96+
CryptoBinaryValue::fromString('GpM5'),
9797
);
9898
$seed = new Seed(
99-
Base64BinaryValue::fromString('GpM6'),
99+
CryptoBinaryValue::fromString('GpM6'),
100100
);
101101
$pgenCounter = new PgenCounter(
102-
Base64BinaryValue::fromString('GpM7'),
102+
CryptoBinaryValue::fromString('GpM7'),
103103
);
104104

105105
$dsaKeyValue = new DSAKeyValue($y, $g, $j, $p, $q, $seed, $pgenCounter);

‎tests/XML/ds/DigestValueTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use SimpleSAML\XML\DOMDocumentFactory;
1010
use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
1111
use SimpleSAML\XMLSecurity\Test\XML\XMLDumper;
12-
use SimpleSAML\XMLSecurity\Type\DigestValueValue;
12+
use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
1313
use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, DigestValue};
1414

1515
use function dirname;
@@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void
4545
public function testMarshalling(): void
4646
{
4747
$digestValue = new DigestValue(
48-
DigestValueValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
48+
DigestValueType::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
4949
);
5050

5151
$this->assertEquals(

‎tests/XML/ds/KeyInfoTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use SimpleSAML\XML\Type\{Base64BinaryValue, IDValue, StringValue};
1212
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
1313
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
14+
use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
1415
use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, AbstractKeyInfoType, KeyInfo, KeyName, MgmtData};
1516
use SimpleSAML\XMLSecurity\XML\ds\{PGPData, PGPKeyID, PGPKeyPacket};
1617
use SimpleSAML\XMLSecurity\XML\ds\{SPKIData, SPKISexp};
@@ -87,7 +88,7 @@ public function testMarshalling(): void
8788
Base64BinaryValue::fromString('GpM6'),
8889
);
8990
$seed = new Seed(
90-
Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
91+
CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
9192
);
9293
$SPKISexp2 = new SPKISexp(
9394
Base64BinaryValue::fromString('GpM7'),
@@ -123,7 +124,7 @@ public function testMarshalling(): void
123124
),
124125
[
125126
new P(
126-
Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
127+
CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
127128
),
128129
],
129130
),

‎tests/XML/ds/ManifestTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
1111
use SimpleSAML\XML\Type\{AnyURIValue, Base64BinaryValue, IDValue};
1212
use SimpleSAML\XMLSecurity\Constants as C;
13+
use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
1314
use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, DigestMethod, DigestValue};
1415
use SimpleSAML\XMLSecurity\XML\ds\{Manifest, Reference, Transform, Transforms};
1516

@@ -51,7 +52,7 @@ public function testMarshalling(): void
5152
AnyURIValue::fromString(C::DIGEST_SHA256),
5253
),
5354
new DigestValue(
54-
Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
55+
DigestValueType::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
5556
),
5657
new Transforms(
5758
[

‎tests/XML/ds/PGPDataTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use SimpleSAML\XML\Exception\SchemaViolationException;
1111
use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
1212
use SimpleSAML\XML\Type\Base64BinaryValue;
13+
use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
1314
use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, AbstractPGPDataType};
1415
use SimpleSAML\XMLSecurity\XML\ds\{PGPData, PGPKeyID, PGPKeyPacket};
1516
use SimpleSAML\XMLSecurity\XML\xenc\P;
@@ -54,7 +55,7 @@ public static function setUpBeforeClass(): void
5455
);
5556

5657
self::$p = new P(
57-
Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
58+
CryptoBinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
5859
);
5960
}
6061

‎tests/XML/ds/RSAKeyValueTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
use PHPUnit\Framework\TestCase;
99
use SimpleSAML\XML\DOMDocumentFactory;
1010
use SimpleSAML\XML\TestUtils\{SchemaValidationTestTrait, SerializableElementTestTrait};
11-
use SimpleSAML\XML\Type\Base64BinaryValue;
1211
use SimpleSAML\XML\Utils\XPath;
12+
use SimpleSAML\XMLSecurity\Type\CryptoBinaryValue;
1313
use SimpleSAML\XMLSecurity\XML\ds\{AbstractDsElement, Exponent, Modulus, RSAKeyValue};
1414

1515
use function dirname;
@@ -42,10 +42,10 @@ public static function setUpBeforeClass(): void
4242

4343
self::$rsaKeyValue = new RSAKeyValue(
4444
new Modulus(
45-
Base64BinaryValue::fromString('dGhpcyBpcyBzb21lIHJhbmRvbSBtb2R1bHVzCg=='),
45+
CryptoBinaryValue::fromString('dGhpcyBpcyBzb21lIHJhbmRvbSBtb2R1bHVzCg=='),
4646
),
4747
new Exponent(
48-
Base64BinaryValue::fromString('dGhpcyBpcyBzb21lIHJhbmRvbSBleHBvbmVudAo='),
48+
CryptoBinaryValue::fromString('dGhpcyBpcyBzb21lIHJhbmRvbSBleHBvbmVudAo='),
4949
),
5050
);
5151
}

0 commit comments

Comments
 (0)