Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"ext-pcre": "*",

"simplesamlphp/assert": "~1.9",
"simplesamlphp/xml-common": "~2.1"
"simplesamlphp/xml-common": "~2.4"
},
"require-dev": {
"simplesamlphp/simplesamlphp-test-framework": "~1.10"
Expand Down
6 changes: 4 additions & 2 deletions src/SOAP11/Utils/XPath.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ class XPath extends \SimpleSAML\XPath\XPath
* Get a DOMXPath object that can be used to search for SAML elements.
*
* @param \DOMNode $node The document to associate to the DOMXPath object.
* @param bool $autoregister Whether to auto-register all namespaces used in the document
*
* @return \DOMXPath A DOMXPath object ready to use in the given document, with several
* saml-related namespaces already registered.
*/
public static function getXPath(DOMNode $node): DOMXPath
public static function getXPath(DOMNode $node, bool $autoregister = false): DOMXPath
{
$xp = parent::getXPath($node);
$xp = parent::getXPath($node, $autoregister);

$xp->registerNamespace('env11', C::NS_SOAP_ENV);
$xp->registerNamespace('enc11', C::NS_SOAP_ENC);

Expand Down
6 changes: 4 additions & 2 deletions src/SOAP12/Utils/XPath.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ class XPath extends \SimpleSAML\XPath\XPath
* Get a DOMXPath object that can be used to search for SAML elements.
*
* @param \DOMNode $node The document to associate to the DOMXPath object.
* @param bool $autoregister Whether to auto-register all namespaces used in the document
*
* @return \DOMXPath A DOMXPath object ready to use in the given document, with several
* saml-related namespaces already registered.
*/
public static function getXPath(DOMNode $node): DOMXPath
public static function getXPath(DOMNode $node, bool $autoregister = false): DOMXPath
{
$xp = parent::getXPath($node);
$xp = parent::getXPath($node, $autoregister);

$xp->registerNamespace('env12', C::NS_SOAP_ENV);
$xp->registerNamespace('enc12', C::NS_SOAP_ENC);

Expand Down