|
8 | 8 | use DOMElement; |
9 | 9 | use Exception; |
10 | 10 | use RobRichards\XMLSecLibs\{XMLSecurityDSig, XMLSecurityKey}; |
11 | | -use SAML2\SignedElementHelper; |
12 | | -use SAML2\XML\md\{EntitiesDescriptor, EntityDescriptor}; |
13 | 11 | use SimpleSAML\Assert\Assert; |
14 | 12 | use SimpleSAML\{Logger, Utils}; |
15 | 13 | use SimpleSAML\SAML2\Constants as C; |
| 14 | +use SimpleSAML\SAML2\XML\md\{AbstractMetadataDocument, EntitiesDescriptor, EntityDescriptor}; |
16 | 15 | use SimpleSAML\SAML2\XML\md\{AbstractRoleDescriptorType, AttributeAuthorityDescriptor}; |
17 | | -use SimpleSAML\SAML2\XML\md\{AbstractMetadataDocument, EntityDescriptor, EntitiesDescriptor}; |
18 | 16 | use SimpleSAML\SAML2\XML\md\{AbstractSSODescriptor, IDPSSODescriptor, SPSSODescriptor}; |
19 | 17 | use SimpleSAML\SAML2\XML\md\{AttributeConsumingService, AbstractEndpointType, KeyDescriptor}; |
20 | 18 | use SimpleSAML\SAML2\XML\md\{ContactPerson, Organization}; |
@@ -369,11 +367,7 @@ public static function parseDescriptorsElement(DOMElement $element = null): arra |
369 | 367 |
|
370 | 368 | /** |
371 | 369 | * |
372 | | -<<<<<<< HEAD |
373 | | - * @param \SAML2\XML\md\EntityDescriptor|\SAML2\XML\md\EntitiesDescriptor $element |
374 | | -======= |
375 | 370 | * @param \SimpleSAML\SAML2\XML\md\AbstractMetadataDocument $element |
376 | | ->>>>>>> 965e6958a (Migrate metadata parsing and generation to new saml2-lib) |
377 | 371 | * The element we should process. |
378 | 372 | * @param int|NULL $maxExpireTime The maximum expiration time of the entities. |
379 | 373 | * @param array $validators The parent-elements that may be signed. |
|
0 commit comments