Skip to content
This repository was archived by the owner on Jan 21, 2026. It is now read-only.

Commit 152f1c4

Browse files
committed
Migrate to xsd-types
1 parent 0bf3e53 commit 152f1c4

218 files changed

Lines changed: 335 additions & 142 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/XML/auth/AbstractAdditionalContextType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ abstract class AbstractAdditionalContextType extends AbstractAuthElement
2222
use ExtendableAttributesTrait;
2323
use ExtendableElementTrait;
2424

25+
2526
/** The namespace-attribute for the xs:anyAttribute */
2627
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
2728

src/XML/auth/AbstractClaimType.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ abstract class AbstractClaimType extends AbstractAuthElement
3737
use ExtendableAttributesTrait;
3838
use ExtendableElementTrait;
3939

40+
4041
/** The namespace-attribute for the xs:anyAttribute */
4142
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
4243

@@ -79,7 +80,10 @@ final public function __construct(
7980
$value instanceof EncryptedValue)
8081
) {
8182
/** @var \SimpleSAML\XML\Chunk|\SimpleSAML\XML\AbstractElement $value */
82-
Assert::notSame($value instanceof Chunk ? $value->getNamespaceURI() : $value::getNamespaceURI(), static::NS);
83+
Assert::notSame(
84+
$value instanceof Chunk ? $value->getNamespaceURI() : $value::getNamespaceURI(),
85+
static::NS,
86+
);
8387
}
8488
$this->setAttributesNS($namespacedAttributes);
8589
}

src/XML/auth/AbstractConstrainedValueType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ abstract class AbstractConstrainedValueType extends AbstractAuthElement
2626
{
2727
use ExtendableElementTrait;
2828

29+
2930
/** The namespace-attribute for the xs:any element */
3031
public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
3132

src/XML/auth/AbstractContextItemType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ abstract class AbstractContextItemType extends AbstractAuthElement
2727
use ExtendableAttributesTrait;
2828
use ExtendableElementTrait;
2929

30+
3031
/** The namespace-attribute for the xs:anyAttribute */
3132
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
3233

src/XML/auth/AbstractDescriptionType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ abstract class AbstractDescriptionType extends AbstractAuthElement
2222
use ExtendableAttributesTrait;
2323
use TypedTextContentTrait;
2424

25+
2526
/** @var string */
2627
public const TEXTCONTENT_TYPE = StringValue::class;
2728

src/XML/auth/AbstractDisplayNameType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ abstract class AbstractDisplayNameType extends AbstractAuthElement
2222
use ExtendableAttributesTrait;
2323
use TypedTextContentTrait;
2424

25+
2526
/** @var string */
2627
public const TEXTCONTENT_TYPE = StringValue::class;
2728

src/XML/auth/AbstractDisplayValueType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ abstract class AbstractDisplayValueType extends AbstractAuthElement
2222
use ExtendableAttributesTrait;
2323
use TypedTextContentTrait;
2424

25+
2526
/** @var string */
2627
public const TEXTCONTENT_TYPE = StringValue::class;
2728

src/XML/auth/AbstractStructuredValueType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ abstract class AbstractStructuredValueType extends AbstractAuthElement
2121
use ExtendableAttributesTrait;
2222
use ExtendableElementTrait;
2323

24+
2425
/** The namespace-attribute for the xs:anyAttribute element */
2526
public const XS_ANY_ATTR_NAMESPACE = NS::OTHER;
2627

src/XML/auth/Value.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ final class Value extends AbstractAuthElement
1616
{
1717
use TypedTextContentTrait;
1818

19+
1920
/** @var string */
2021
public const TEXTCONTENT_TYPE = StringValue::class;
2122
}

src/XML/fed/AbstractApplicationServiceType.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
namespace SimpleSAML\WSSecurity\XML\fed;
66

77
use DOMElement;
8-
use SimpleSAML\SAML2\Type\SAMLAnyURIValue;
98
use SimpleSAML\SAML2\Type\SAMLAnyURIListValue;
9+
use SimpleSAML\SAML2\Type\SAMLAnyURIValue;
1010
use SimpleSAML\SAML2\Type\SAMLDateTimeValue;
1111
use SimpleSAML\SAML2\Type\SAMLStringValue;
1212
use SimpleSAML\SAML2\XML\md\Extensions;
@@ -15,7 +15,6 @@
1515
use SimpleSAML\WSSecurity\Constants as C;
1616
use SimpleSAML\XMLSchema\Exception\MissingElementException;
1717
use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
18-
use SimpleSAML\XMLSchema\Type\AnyURIValue;
1918
use SimpleSAML\XMLSchema\Type\DurationValue;
2019
use SimpleSAML\XMLSchema\Type\IDValue;
2120
use SimpleSAML\XMLSchema\Type\QNameValue;
@@ -41,12 +40,16 @@ abstract class AbstractApplicationServiceType extends AbstractWebServiceDescript
4140
* ApplicationServiceType constructor.
4241
*
4342
* @param \SimpleSAML\XMLSchema\Type\QNameValue $type The xsi-type of the element
44-
* @param \SimpleSAML\SAML2\Type\SAMLAnyURIListValue $protocolSupportEnumeration A set of URI specifying the protocols supported.
43+
* @param \SimpleSAML\SAML2\Type\SAMLAnyURIListValue $protocolSupportEnumeration
44+
* A set of URI specifying the protocols supported.
4545
* @param \SimpleSAML\XMLSchema\Type\IDValue|null $ID The ID for this document. Defaults to null.
46-
* @param \SimpleSAML\SAML2\Type\SAMLDateTimeValue|null $validUntil Unix time of validity for this document. Defaults to null.
47-
* @param \SimpleSAML\XMLSchema\Type\DurationValue|null $cacheDuration Maximum time this document can be cached. Defaults to null.
46+
* @param \SimpleSAML\SAML2\Type\SAMLDateTimeValue|null $validUntil
47+
* Unix time of validity for this document. Defaults to null.
48+
* @param \SimpleSAML\XMLSchema\Type\DurationValue|null $cacheDuration
49+
* Maximum time this document can be cached. Defaults to null.
4850
* @param \SimpleSAML\SAML2\XML\md\Extensions|null $extensions An array of extensions. Defaults to an empty array.
49-
* @param \SimpleSAML\SAML2\Type\SAMLAnyURIValue|null $errorURL An URI where to redirect users for support. Defaults to null.
51+
* @param \SimpleSAML\SAML2\Type\SAMLAnyURIValue|null $errorURL
52+
* An URI where to redirect users for support. Defaults to null.
5053
* @param \SimpleSAML\SAML2\XML\md\KeyDescriptor[] $keyDescriptor An array of KeyDescriptor elements.
5154
* Defaults to an empty array.
5255
* @param \SimpleSAML\SAML2\XML\md\Organization|null $organization

0 commit comments

Comments
 (0)