Fix namespace for SOAP-elements

simplesamlphp · Nov 14, 2024 · 85aca30 · 85aca30
1 parent 12984ec
commit 85aca30
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -91,12 +91,12 @@ parameters:
 			path: src/Configuration/SimpleSAMLConverter.php
 
 		-
-			message: "#^Call to static method fromXML\\(\\) on an unknown class SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Envelope\\.$#"
+			message: "#^Call to static method fromXML\\(\\) on an unknown class SimpleSAML\\\\SOAP11\\\\XML\\\\env_200106\\\\Envelope\\.$#"
 			count: 1
 			path: src/SOAPClient.php
 
 		-
-			message: "#^Call to static method fromXML\\(\\) on an unknown class SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Fault\\.$#"
+			message: "#^Call to static method fromXML\\(\\) on an unknown class SimpleSAML\\\\SOAP11\\\\XML\\\\env_200106\\\\Fault\\.$#"
 			count: 1
 			path: src/SOAPClient.php
 
@@ -111,12 +111,12 @@ parameters:
 			path: src/SOAPClient.php
 
 		-
-			message: "#^Instantiated class SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Body not found\\.$#"
+			message: "#^Instantiated class SimpleSAML\\\\SOAP11\\\\XML\\\\env_200106\\\\Body not found\\.$#"
 			count: 1
 			path: src/SOAPClient.php
 
 		-
-			message: "#^Instantiated class SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Envelope not found\\.$#"
+			message: "#^Instantiated class SimpleSAML\\\\SOAP11\\\\XML\\\\env_200106\\\\Envelope not found\\.$#"
 			count: 1
 			path: src/SOAPClient.php
 
@@ -131,7 +131,7 @@ parameters:
 			path: src/SOAPClient.php
 
 		-
-			message: "#^Method SimpleSAML\\\\SAML2\\\\SOAPClient\\:\\:getSOAPFault\\(\\) has invalid return type SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Fault\\.$#"
+			message: "#^Method SimpleSAML\\\\SAML2\\\\SOAPClient\\:\\:getSOAPFault\\(\\) has invalid return type SimpleSAML\\\\SOAP11\\\\XML\\\\env_200106\\\\Fault\\.$#"
 			count: 1
 			path: src/SOAPClient.php
 

diff --git a/src/SOAPClient.php b/src/SOAPClient.php
@@ -10,10 +10,10 @@
 use SimpleSAML\SAML2\Compat\ContainerSingleton;
 use SimpleSAML\SAML2\XML\samlp\AbstractMessage;
 use SimpleSAML\SAML2\XML\samlp\MessageFactory;
-use SimpleSAML\SOAP11\Utils\XPath;
-use SimpleSAML\SOAP11\XML\env\Body;
-use SimpleSAML\SOAP11\XML\env\Envelope;
-use SimpleSAML\SOAP11\XML\env\Fault;
+use SimpleSAML\SOAP\Utils\XPath;
+use SimpleSAML\SOAP\XML\env_200106\Body;
+use SimpleSAML\SOAP\XML\env_200106\Envelope;
+use SimpleSAML\SOAP\XML\env_200106\Fault;
 use SimpleSAML\Utils\Config;
 use SimpleSAML\Utils\Crypto;
 use SimpleSAML\XML\Chunk;
@@ -255,7 +255,7 @@ public static function validateSSL(string $data, XMLSecurityKey $key): void
      * Extracts the SOAP Fault from SOAP message
      *
      * @param \DOMDocument $soapMessage Soap response needs to be type DOMDocument
-     * @return \SimpleSAML\SOAP11\XML\env\Fault|null
+     * @return \SimpleSAML\SOAP\XML\env_200106\Fault|null
      */
     private function getSOAPFault(DOMDocument $soapMessage): ?Fault
     {