Skip to content

Commit 390adea

Browse files
tvdijentvdijen
committed
Use the correct xml:lang instead of xs:language
1 parent 224290b commit 390adea

29 files changed

+115
-148
lines changed

‎src/XML/md/AbstractLocalizedName.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
use SimpleSAML\SAML2\Type\SAMLStringValue;
1111
use SimpleSAML\XML\ArrayizableElementInterface;
1212
use SimpleSAML\XML\Constants as C;
13+
use SimpleSAML\XML\Type\LangValue;
1314
use SimpleSAML\XML\TypedTextContentTrait;
1415
use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
1516
use SimpleSAML\XMLSchema\Exception\MissingAttributeException;
16-
use SimpleSAML\XMLSchema\Type\LanguageValue;
1717

1818
use function array_key_first;
1919

@@ -33,11 +33,11 @@ abstract class AbstractLocalizedName extends AbstractMdElement implements Arrayi
3333
/**
3434
* LocalizedNameType constructor.
3535
*
36-
* @param \SimpleSAML\XMLSchema\Type\LanguageValue $language The language this string is localized in.
36+
* @param \SimpleSAML\XML\Type\LangValue $language The language this string is localized in.
3737
* @param \SimpleSAML\SAML2\Type\SAMLStringValue $content The localized string.
3838
*/
3939
public function __construct(
40-
protected LanguageValue $language,
40+
protected LangValue $language,
4141
SAMLStringValue $content,
4242
) {
4343
$this->setContent($content);
@@ -47,9 +47,9 @@ public function __construct(
4747
/**
4848
* Get the language this string is localized in.
4949
*
50-
* @return \SimpleSAML\XMLSchema\Type\LanguageValue
50+
* @return \SimpleSAML\XML\Type\LangValue
5151
*/
52-
public function getLanguage(): LanguageValue
52+
public function getLanguage(): LangValue
5353
{
5454
return $this->language;
5555
}
@@ -72,7 +72,7 @@ public static function fromXML(DOMElement $xml): static
7272
);
7373

7474
return new static(
75-
LanguageValue::fromString($xml->getAttributeNS(C::NS_XML, 'lang')),
75+
LangValue::fromString($xml->getAttributeNS(C::NS_XML, 'lang')),
7676
SAMLStringValue::fromString($xml->textContent),
7777
);
7878
}
@@ -99,7 +99,7 @@ public static function fromArray(array $data): static
9999
{
100100
Assert::count($data, 1, ArrayValidationException::class);
101101

102-
$lang = LanguageValue::fromString(array_key_first($data));
102+
$lang = LangValue::fromString(array_key_first($data));
103103
$value = SAMLStringValue::fromString($data[$lang->getValue()]);
104104

105105
return new static($lang, $value);

‎src/XML/md/AbstractLocalizedURI.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use SimpleSAML\SAML2\Constants as C;
1010
use SimpleSAML\SAML2\Type\SAMLAnyURIValue;
1111
use SimpleSAML\SAML2\Type\SAMLStringValue;
12+
use SimpleSAML\XML\Type\LangValue;
1213
use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
1314
use SimpleSAML\XMLSchema\Exception\MissingAttributeException;
14-
use SimpleSAML\XMLSchema\Type\LanguageValue;
1515

1616
use function array_key_first;
1717

@@ -28,11 +28,11 @@ abstract class AbstractLocalizedURI extends AbstractLocalizedName
2828
/**
2929
* LocalizedNameType constructor.
3030
*
31-
* @param \SimpleSAML\XMLSchema\Type\LanguageValue $language The language this string is localized in.
31+
* @param \SimpleSAML\XML\Type\LangValue $language The language this string is localized in.
3232
* @param \SimpleSAML\SAML2\Type\SAMLAnyURIValue $content The localized string.
3333
*/
3434
final public function __construct(
35-
protected LanguageValue $language,
35+
protected LangValue $language,
3636
SAMLAnyURIValue $content,
3737
) {
3838
$content = SAMLStringValue::fromString($content->getValue());
@@ -58,7 +58,7 @@ public static function fromXML(DOMElement $xml): static
5858
);
5959

6060
return new static(
61-
LanguageValue::fromString($xml->getAttributeNS(C::NS_XML, 'lang')),
61+
LangValue::fromString($xml->getAttributeNS(C::NS_XML, 'lang')),
6262
SAMLAnyURIValue::fromString($xml->textContent),
6363
);
6464
}
@@ -73,7 +73,7 @@ public static function fromArray(array $data): static
7373
{
7474
Assert::count($data, 1);
7575

76-
$lang = LanguageValue::fromString(array_key_first($data));
76+
$lang = LangValue::fromString(array_key_first($data));
7777
$value = SAMLAnyURIValue::fromString(
7878
$data[$lang->getValue()],
7979
);

‎src/XML/mdui/Keywords.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use SimpleSAML\XML\ArrayizableElementInterface;
1313
use SimpleSAML\XML\SchemaValidatableElementInterface;
1414
use SimpleSAML\XML\SchemaValidatableElementTrait;
15+
use SimpleSAML\XML\Type\LangValue;
1516
use SimpleSAML\XML\TypedTextContentTrait;
1617
use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
17-
use SimpleSAML\XMLSchema\Type\LanguageValue;
1818

1919
use function array_key_first;
2020

@@ -38,11 +38,11 @@ final class Keywords extends AbstractMduiElement implements
3838
/**
3939
* Initialize a Keywords.
4040
*
41-
* @param \SimpleSAML\XMLSchema\Type\LanguageValue $lang
41+
* @param \SimpleSAML\XML\Type\LangValue $lang
4242
* @param \SimpleSAML\SAML2\Type\ListOfStringsValue $keywords
4343
*/
4444
public function __construct(
45-
protected LanguageValue $lang,
45+
protected LangValue $lang,
4646
ListOfStringsValue $keywords,
4747
) {
4848
$this->setContent($keywords);
@@ -52,9 +52,9 @@ public function __construct(
5252
/**
5353
* Collect the value of the lang-property
5454
*
55-
* @return \SimpleSAML\XMLSchema\Type\LanguageValue
55+
* @return \SimpleSAML\XML\Type\LangValue
5656
*/
57-
public function getLanguage(): LanguageValue
57+
public function getLanguage(): LangValue
5858
{
5959
return $this->lang;
6060
}
@@ -74,7 +74,7 @@ public static function fromXML(DOMElement $xml): static
7474
Assert::same($xml->namespaceURI, Keywords::NS, InvalidDOMElementException::class);
7575
Assert::stringNotEmpty($xml->textContent, 'Missing value for Keywords.');
7676

77-
$lang = self::getAttribute($xml, 'xml:lang', LanguageValue::class);
77+
$lang = self::getAttribute($xml, 'xml:lang', LangValue::class);
7878
$Keywords = ListOfStringsValue::fromString($xml->textContent);
7979

8080
return new static($lang, $Keywords);
@@ -106,7 +106,7 @@ public static function fromArray(array $data): static
106106
Assert::notEmpty($data, ArrayValidationException::class);
107107
Assert::count($data, 1, ArrayValidationException::class);
108108

109-
$lang = LanguageValue::fromString(array_key_first($data));
109+
$lang = LangValue::fromString(array_key_first($data));
110110
$keywords = $data[$lang->getValue()];
111111

112112
Assert::allNotContains($keywords, '+', ProtocolViolationException::class);

‎src/XML/mdui/Logo.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
use SimpleSAML\XML\ArrayizableElementInterface;
1313
use SimpleSAML\XML\SchemaValidatableElementInterface;
1414
use SimpleSAML\XML\SchemaValidatableElementTrait;
15+
use SimpleSAML\XML\Type\LangValue;
1516
use SimpleSAML\XML\TypedTextContentTrait;
1617
use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
1718
use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
18-
use SimpleSAML\XMLSchema\Type\LanguageValue;
1919
use SimpleSAML\XMLSchema\Type\PositiveIntegerValue;
2020

2121
/**
@@ -44,13 +44,13 @@ final class Logo extends AbstractMduiElement implements
4444
* @param \SimpleSAML\SAML2\Type\SAMLAnyURIValue $url
4545
* @param \SimpleSAML\XMLSchema\Type\PositiveIntegerValue $height
4646
* @param \SimpleSAML\XMLSchema\Type\PositiveIntegerValue $width
47-
* @param \SimpleSAML\XMLSchema\Type\LanguageValue|null $lang
47+
* @param \SimpleSAML\XML\Type\LangValue|null $lang
4848
*/
4949
public function __construct(
5050
SAMLAnyURIValue $url,
5151
protected PositiveIntegerValue $height,
5252
protected PositiveIntegerValue $width,
53-
protected ?LanguageValue $lang = null,
53+
protected ?LangValue $lang = null,
5454
) {
5555
$this->setContent($url);
5656
}
@@ -73,9 +73,9 @@ protected function validateContent(string $content): void
7373
/**
7474
* Collect the value of the lang-property
7575
*
76-
* @return \SimpleSAML\XMLSchema\Type\LanguageValue|null
76+
* @return \SimpleSAML\XML\Type\LangValue|null
7777
*/
78-
public function getLanguage(): ?LanguageValue
78+
public function getLanguage(): ?LangValue
7979
{
8080
return $this->lang;
8181
}
@@ -120,7 +120,7 @@ public static function fromXML(DOMElement $xml): static
120120
$Url = SAMLAnyURIValue::fromString($xml->textContent);
121121
$Width = self::getAttribute($xml, 'width', PositiveIntegerValue::class);
122122
$Height = self::getAttribute($xml, 'height', PositiveIntegerValue::class);
123-
$lang = self::getOptionalAttribute($xml, 'xml:lang', LanguageValue::class, null);
123+
$lang = self::getOptionalAttribute($xml, 'xml:lang', LangValue::class, null);
124124

125125
return new static($Url, $Height, $Width, $lang);
126126
}
@@ -162,7 +162,7 @@ public static function fromArray(array $data): static
162162
SAMLAnyURIValue::fromString($data['url']),
163163
PositiveIntegerValue::fromInteger($data['height']),
164164
PositiveIntegerValue::fromInteger($data['width']),
165-
$data['lang'] !== null ? LanguageValue::fromString($data['lang']) : null,
165+
$data['lang'] !== null ? LangValue::fromString($data['lang']) : null,
166166
);
167167
}
168168

‎tests/SAML2/XML/md/AbstractLocalizedNameTest.php‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@
88
use PHPUnit\Framework\Attributes\CoversClass;
99
use PHPUnit\Framework\Attributes\Group;
1010
use PHPUnit\Framework\TestCase;
11-
use SimpleSAML\SAML2\Constants as C;
1211
use SimpleSAML\SAML2\Exception\ProtocolViolationException;
1312
use SimpleSAML\SAML2\XML\md\AbstractLocalizedName;
1413
use SimpleSAML\SAML2\XML\md\AbstractMdElement;
1514
use SimpleSAML\SAML2\XML\md\ServiceDescription;
1615
use SimpleSAML\XML\DOMDocumentFactory;
17-
use SimpleSAML\XMLSchema\Exception\MissingAttributeException;
18-
use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
1916

2017
use function dirname;
2118

@@ -47,36 +44,6 @@ public static function setUpBeforeClass(): void
4744
// test unmarshalling
4845

4946

50-
/**
51-
* Test that creating a ServiceDescription from XML fails when xml:lang is missing.
52-
*/
53-
public function testUnmarshallingWithoutLang(): void
54-
{
55-
$xmlRepresentation = clone self::$xmlRepresentation;
56-
$xmlRepresentation->documentElement->removeAttributeNS(C::NS_XML, 'lang');
57-
58-
$this->expectException(MissingAttributeException::class);
59-
$this->expectExceptionMessage('Missing xml:lang from ServiceDescription');
60-
61-
ServiceDescription::fromXML($xmlRepresentation->documentElement);
62-
}
63-
64-
65-
/**
66-
* Test that creating a ServiceDescription from XML fails when xml:lang is empty.
67-
*/
68-
public function testUnmarshallingWithEmptyLang(): void
69-
{
70-
$xmlRepresentation = clone self::$xmlRepresentation;
71-
$xmlRepresentation->documentElement->setAttributeNS(C::NS_XML, 'lang', '');
72-
73-
$this->expectException(SchemaViolationException::class);
74-
$this->expectExceptionMessage('"" is not a valid xs:language');
75-
76-
ServiceDescription::fromXML($xmlRepresentation->documentElement);
77-
}
78-
79-
8047
/**
8148
* Test that creating a ServiceDescription from XML works for empty values.
8249
*/

‎tests/SAML2/XML/md/AttributeConsumingServiceTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
use SimpleSAML\XML\DOMDocumentFactory;
2020
use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
2121
use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
22+
use SimpleSAML\XML\Type\LangValue;
2223
use SimpleSAML\XMLSchema\Exception\MissingAttributeException;
2324
use SimpleSAML\XMLSchema\Exception\MissingElementException;
2425
use SimpleSAML\XMLSchema\Type\BooleanValue;
25-
use SimpleSAML\XMLSchema\Type\LanguageValue;
2626
use SimpleSAML\XMLSchema\Type\StringValue;
2727
use SimpleSAML\XMLSchema\Type\UnsignedShortValue;
2828

@@ -80,15 +80,15 @@ public function testMarshalling(): void
8080
UnsignedShortValue::fromInteger(2),
8181
[
8282
new ServiceName(
83-
LanguageValue::fromString('en'),
83+
LangValue::fromString('en'),
8484
SAMLStringValue::fromString('Academic Journals R US'),
8585
),
8686
],
8787
[self::$requestedAttribute],
8888
BooleanValue::fromBoolean(true),
8989
[
9090
new ServiceDescription(
91-
LanguageValue::fromString('en'),
91+
LangValue::fromString('en'),
9292
SAMLStringValue::fromString('Academic Journals R US and only us'),
9393
),
9494
],
@@ -110,7 +110,7 @@ public function testMarshallingWithoutDescription(): void
110110
UnsignedShortValue::fromInteger(2),
111111
[
112112
new ServiceName(
113-
LanguageValue::fromString('en'),
113+
LangValue::fromString('en'),
114114
SAMLStringValue::fromString('Academic Journals R US'),
115115
),
116116
],
@@ -146,14 +146,14 @@ public function testMarshallingWithoutIsDefault(): void
146146
index: UnsignedShortValue::fromInteger(2),
147147
serviceName: [
148148
new ServiceName(
149-
LanguageValue::fromString('en'),
149+
LangValue::fromString('en'),
150150
SAMLStringValue::fromString('Academic Journals R US'),
151151
),
152152
],
153153
requestedAttribute: [self::$requestedAttribute],
154154
serviceDescription: [
155155
new ServiceDescription(
156-
LanguageValue::fromString('en'),
156+
LangValue::fromString('en'),
157157
SAMLStringValue::fromString('Academic Journals R US and only us'),
158158
),
159159
],
@@ -193,7 +193,7 @@ public function testMarshallingWithEmptyRequestedAttributes(): void
193193
UnsignedShortValue::fromInteger(2),
194194
[
195195
new ServiceName(
196-
LanguageValue::fromString('en'),
196+
LangValue::fromString('en'),
197197
SAMLStringValue::fromString('Academic Journals R US'),
198198
),
199199
],

‎tests/SAML2/XML/md/EntitiesDescriptorTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
use SimpleSAML\XML\DOMDocumentFactory;
2424
use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
2525
use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
26+
use SimpleSAML\XML\Type\LangValue;
2627
use SimpleSAML\XMLSchema\Type\IDValue;
27-
use SimpleSAML\XMLSchema\Type\LanguageValue;
2828
use SimpleSAML\XMLSecurity\TestUtils\SignedElementTestTrait;
2929

3030
use function dirname;
@@ -73,7 +73,7 @@ public function testMarshalling(): void
7373
creationInstant: SAMLDateTimeValue::fromString('2020-02-03T13:46:24Z'),
7474
usagePolicy: [
7575
new UsagePolicy(
76-
LanguageValue::fromString('en'),
76+
LangValue::fromString('en'),
7777
SAMLAnyURIValue::fromString('http://publisher.ra/policy.txt'),
7878
),
7979
],

0 commit comments

Comments
 (0)