Fix conflict

Author: tvdijen

src/SAML2/HTTPArtifact.php

@@ -9,7 +9,7 @@
 use SimpleSAML\Metadata\MetaDataStorageHandler;
 use SimpleSAML\Module\saml\Message as MSG;
 use SimpleSAML\Store\StoreFactory;
-use SimpleSAML\Utils;
+use SimpleSAML\Utils\HTTP;
 
 use SAML2\Utilities\Temporal;
 use SAML2\XML\saml\Issuer;
@@ -69,7 +69,7 @@ public function getRedirectURL(Message $message) : string
         if ($destination === null) {
             throw new \Exception('Cannot get redirect URL, no destination set in the message.');
         }
-        $httpUtils = new Utils\HTTP();
+        $httpUtils = new HTTP();
         return $httpUtils->addURLparameters($destination, $params);
     }
 

src/SAML2/SOAPClient.php

@@ -12,7 +12,8 @@
 use SAML2\Exception\InvalidArgumentException;
 use SAML2\Exception\UnparseableXmlException;
 use SimpleSAML\Configuration;
-use SimpleSAML\Utils;
+use SimpleSAML\Utils\Config;
+use SimpleSAML\Utils\Crypto;
 //use SoapClient as BuiltinSoapClient;
 use SOAP_1_1;
 
@@ -57,7 +58,7 @@ public function send(Message $msg, Configuration $srcMetadata, Configuration $ds
         if ($srcMetadata->hasValue('saml.SOAPClient.certificate')) {
             $cert = $srcMetadata->getValue('saml.SOAPClient.certificate');
             if ($cert !== false) {
-                $configUtils = new Utils\Config();
+                $configUtils = new Config();
                 $ctxOpts['ssl']['local_cert'] = $configUtils->getCertPath(
                     $srcMetadata->getString('saml.SOAPClient.certificate')
                 );
@@ -66,7 +67,7 @@ public function send(Message $msg, Configuration $srcMetadata, Configuration $ds
                 }
             }
         } else {
-            $cryptoUtils = new Utils\Crypto();
+            $cryptoUtils = new Crypto();
 
             /* Use the SP certificate and privatekey if it is configured. */
             $privateKey = $cryptoUtils->loadPrivateKey($srcMetadata);