Skip to content

Commit 8cda24f

Browse files
committed
Move element registry
1 parent cf3c0c3 commit 8cda24f

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@
2323
"psr/http-message": "~2.0",
2424
"psr/log": "~2.3.1 || ~3.0.0",
2525
"simplesamlphp/assert": "~1.8.1",
26-
"simplesamlphp/xml-common": "~1.24.2",
27-
"simplesamlphp/xml-security": "~1.13.0",
26+
"simplesamlphp/xml-common": "~1.25.0",
27+
"simplesamlphp/xml-security": "~1.13.4",
2828
"simplesamlphp/xml-soap": "~1.7.0"
2929
},
3030
"require-dev": {
3131
"ext-intl": "*",
3232

3333
"beste/clock": "~3.0.0",
3434
"mockery/mockery": "~1.6.12",
35+
"simplesamlphp/composer-xmlprovider-installer": "~1.0.2",
3536
"simplesamlphp/simplesamlphp-test-framework": "~1.9.2"
3637
},
3738
"suggest": {

tests/SAML2/XML/ElementRegistryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class ElementRegistryTest extends TestCase
2323
*/
2424
public function testElementRegistry(): void
2525
{
26-
$elementRegistry = dirname(__FILE__, 4) . '/src/XML/element.registry.php';
26+
$elementRegistry = dirname(__FILE__, 4) . '/classes/element.registry.php';
2727
$namespaces = include($elementRegistry);
2828

2929
foreach ($namespaces as $namespaceURI => $elements) {

tests/SAML2/XML/md/SPSSODescriptorTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,9 @@ public function testUnmarshallingTwoDefaultACS(): void
286286
$acs->item(1)->setAttribute('isDefault', 'true');
287287

288288
$this->expectException(AssertionFailedException::class);
289-
$this->expectExceptionMessage('Only one md:AttributeConsumingService can be set as default.');
289+
$this->expectExceptionMessage(
290+
'At most one <AttributeConsumingService> element can have the attribute isDefault set to true.'
291+
);
290292

291293
SPSSODescriptor::fromXML($xmlRepresentation->documentElement);
292294
}

tests/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
ContainerSingleton::setContainer($container);
2020

2121
$registry = ElementRegistry::getInstance();
22-
$registry->importFromFile(dirname(__FILE__, 2) . '/src/XML/element.registry.php');
22+
$registry->importFromFile(dirname(__FILE__, 2) . '/classes/element.registry.php');

0 commit comments

Comments
 (0)