Skip to content

Commit d6f8be2

Browse files
committed
Use shorthand instantiation for typed textcontent types
1 parent 7ca6e17 commit d6f8be2

6 files changed

Lines changed: 7 additions & 11 deletions

File tree

tests/MetadataExchange/XML/wsx/DialectTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use SimpleSAML\XML\DOMDocumentFactory;
1414
use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
1515
use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
16-
use SimpleSAML\XMLSchema\Type\AnyURIValue;
1716

1817
use function dirname;
1918

@@ -51,7 +50,7 @@ public static function setUpBeforeClass(): void
5150
*/
5251
public function testMarshalling(): void
5352
{
54-
$dialect = new Dialect(AnyURIValue::fromString(C::NAMESPACE));
53+
$dialect = Dialect::fromString(C::NAMESPACE);
5554

5655
$this->assertEquals(
5756
self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),

tests/MetadataExchange/XML/wsx/GetMetadataTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use SimpleSAML\XML\DOMDocumentFactory;
1616
use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
1717
use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
18-
use SimpleSAML\XMLSchema\Type\AnyURIValue;
1918
use SimpleSAML\XMLSchema\Type\StringValue;
2019

2120
use function dirname;
@@ -58,8 +57,8 @@ public function testMarshalling(): void
5857
$attr1 = new Attribute('urn:x-simplesamlphp:namespace', 'ssp', 'attr1', StringValue::fromString('testval1'));
5958

6059
$getMetadata = new GetMetadata(
61-
new Dialect(AnyURIValue::fromString('urn:x-simplesamlphp:namespace')),
62-
new Identifier(AnyURIValue::fromString('urn:x-simplesamlphp:namespace')),
60+
Dialect::fromString('urn:x-simplesamlphp:namespace'),
61+
Identifier::fromString('urn:x-simplesamlphp:namespace'),
6362
[$attr1],
6463
);
6564

tests/MetadataExchange/XML/wsx/IdentifierTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use SimpleSAML\XML\DOMDocumentFactory;
1414
use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
1515
use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
16-
use SimpleSAML\XMLSchema\Type\AnyURIValue;
1716

1817
use function dirname;
1918

@@ -51,7 +50,7 @@ public static function setUpBeforeClass(): void
5150
*/
5251
public function testMarshalling(): void
5352
{
54-
$identifier = new Identifier(AnyURIValue::fromString(C::NAMESPACE));
53+
$identifier = Identifier::fromString(C::NAMESPACE);
5554

5655
$this->assertEquals(
5756
self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),

tests/MetadataExchange/XML/wsx/LocationTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use SimpleSAML\XML\DOMDocumentFactory;
1414
use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
1515
use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
16-
use SimpleSAML\XMLSchema\Type\AnyURIValue;
1716

1817
use function dirname;
1918

@@ -51,7 +50,7 @@ public static function setUpBeforeClass(): void
5150
*/
5251
public function testMarshalling(): void
5352
{
54-
$location = new Location(AnyURIValue::fromString(C::NAMESPACE));
53+
$location = Location::fromString(C::NAMESPACE);
5554

5655
$this->assertEquals(
5756
self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),

tests/MetadataExchange/XML/wsx/MetadataSectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function testMarshalling(): void
5757
$attr1 = new Attribute('urn:x-simplesamlphp:namespace', 'ssp', 'attr1', StringValue::fromString('testval1'));
5858

5959
$metadataSection = new MetadataSection(
60-
new Location(AnyURIValue::fromString('urn:x-simplesamlphp:namespace')),
60+
Location::fromString('urn:x-simplesamlphp:namespace'),
6161
AnyURIValue::fromString('urn:x-simplesamlphp:namespace'),
6262
AnyURIValue::fromString('urn:x-simplesamlphp:namespace'),
6363
[$attr1],

tests/MetadataExchange/XML/wsx/MetadataTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testMarshalling(): void
6464
);
6565

6666
$metadataSection = new MetadataSection(
67-
new Location(AnyURIValue::fromString('urn:x-simplesamlphp:namespace')),
67+
Location::fromString('urn:x-simplesamlphp:namespace'),
6868
AnyURIValue::fromString('urn:x-simplesamlphp:namespace'),
6969
AnyURIValue::fromString('urn:x-simplesamlphp:namespace'),
7070
[$attr2],

0 commit comments

Comments
 (0)