Use shorthand instantiation for typed textcontent types

Author: tvdijen

composer.json

@@ -15,12 +15,12 @@
         "ext-spl": "*",
 
         "simplesamlphp/assert": "~1.9",
-        "simplesamlphp/xml-common": "~2.5",
-        "simplesamlphp/xml-security": "~2.1",
-        "simplesamlphp/xml-soap": "~2.1"
+        "simplesamlphp/xml-common": "~2.6",
+        "simplesamlphp/xml-security": "~2.2"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "~1.11"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.11",
+        "simplesamlphp/xml-soap": "~2.2"
     },
     "autoload": {
         "psr-4": {

tests/Security/XML/wsse/SecurityTest.php

@@ -22,7 +22,6 @@
 use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
 use SimpleSAML\XMLSchema\Type\StringValue;
 use SimpleSAML\XMLSecurity\Constants as C;
-use SimpleSAML\XMLSecurity\Type\DigestValue as DigestValueType;
 use SimpleSAML\XMLSecurity\XML\ds\CanonicalizationMethod;
 use SimpleSAML\XMLSecurity\XML\ds\DigestMethod;
 use SimpleSAML\XMLSecurity\XML\ds\DigestValue;
@@ -96,16 +95,12 @@ public function testMarshalling(): void
 
         $signature = new Signature(
             new SignedInfo(
-                new CanonicalizationMethod(
-                    AnyURIValue::fromString(C::C14N_EXCLUSIVE_WITHOUT_COMMENTS),
-                ),
-                new SignatureMethod(
-                    AnyURIValue::fromString(C::SIG_RSA_SHA256),
-                ),
+                new CanonicalizationMethod(AnyURIValue::fromString(C::C14N_EXCLUSIVE_WITHOUT_COMMENTS)),
+                new SignatureMethod(AnyURIValue::fromString(C::SIG_RSA_SHA256)),
                 [
                     new DSReference(
                         new DigestMethod(AnyURIValue::fromString(C::DIGEST_SHA256)),
-                        new DigestValue(DigestValueType::fromString($content)),
+                        DigestValue::fromString($content),
                         null,
                         null,
                         null,

tests/Security/XML/wsse11/EncryptedHeaderTest.php

@@ -16,7 +16,6 @@
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 use SimpleSAML\XMLSchema\Type\AnyURIValue;
-use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
 use SimpleSAML\XMLSchema\Type\IDValue as BaseIDValue;
 use SimpleSAML\XMLSchema\Type\StringValue;
 use SimpleSAML\XMLSecurity\Constants as C;
@@ -69,34 +68,26 @@ public function testMarshalling(): void
 
         $encryptedData = new EncryptedData(
             new CipherData(
-                new CipherValue(
-                    Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
-                ),
+                CipherValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
             ),
             BaseIDValue::fromString('MyID'),
             AnyURIValue::fromString(C::XMLENC_ELEMENT),
             StringValue::fromString('text/plain'),
             AnyURIValue::fromString('urn:x-simplesamlphp:encoding'),
-            new EncryptionMethod(
-                AnyURIValue::fromString(C::BLOCK_ENC_AES128),
-            ),
+            new EncryptionMethod(AnyURIValue::fromString(C::BLOCK_ENC_AES128)),
             new KeyInfo(
                 [
                     new EncryptedKey(
                         new CipherData(
-                            new CipherValue(
-                                Base64BinaryValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
-                            ),
+                            CipherValue::fromString('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI='),
                         ),
                         null,
                         null,
                         null,
                         null,
                         null,
                         null,
-                        new EncryptionMethod(
-                            AnyURIValue::fromString(C::SIG_RSA_SHA256),
-                        ),
+                        new EncryptionMethod(AnyURIValue::fromString(C::SIG_RSA_SHA256)),
                     ),
                 ],
             ),

tests/Security/XML/wsse11/IterationTest.php

@@ -12,7 +12,6 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
-use SimpleSAML\XMLSchema\Type\UnsignedIntValue;
 
 use function dirname;
 use function strval;
@@ -51,9 +50,7 @@ public static function setUpBeforeClass(): void
      */
     public function testMarshalling(): void
     {
-        $iteration = new Iteration(
-            UnsignedIntValue::fromInteger(5),
-        );
+        $iteration = Iteration::fromString('5');
 
         $this->assertEquals(
             self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),

tests/Security/XML/wsse11/SaltTest.php

@@ -12,7 +12,6 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
-use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
 
 use function dirname;
 use function strval;
@@ -53,9 +52,7 @@ public function testMarshalling(): void
     {
         $content = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
 
-        $salt = new Salt(
-            Base64BinaryValue::fromString($content),
-        );
+        $salt = Salt::fromString($content);
 
         $this->assertEquals(
             self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),