Replace static calls with non-static ones

Author: tvdijen

src/SAML2/HTTPArtifact.php

@@ -8,8 +8,8 @@
 use SimpleSAML\Configuration;
 use SimpleSAML\Metadata\MetaDataStorageHandler;
 use SimpleSAML\Module\saml\Message as MSG;
-use SimpleSAML\Store;
-use SimpleSAML\Utils\HTTP;
+use SimpleSAML\Store\StoreFactory;
+use SimpleSAML\Utils;
 
 use SAML2\Utilities\Temporal;
 use SAML2\XML\saml\Issuer;
@@ -38,7 +38,10 @@ class HTTPArtifact extends Binding
     public function getRedirectURL(Message $message) : string
     {
         /** @psalm-suppress UndefinedClass */
-        $store = Store::getInstance();
+        $config = Configuration::getInstance();
+
+        /** @psalm-suppress UndefinedClass */
+        $store = StoreFactory::getInstance($config->getString('store.type'));
         if ($store === false) {
             throw new \Exception('Unable to send artifact without a datastore configured.');
         }
@@ -66,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 HTTP();
+        $httpUtils = new Utils\HTTP();
         return $httpUtils->addURLparameters($destination, $params);
     }
 

src/SAML2/SOAPClient.php

@@ -12,8 +12,7 @@
 use SAML2\Exception\InvalidArgumentException;
 use SAML2\Exception\UnparseableXmlException;
 use SimpleSAML\Configuration;
-use SimpleSAML\Utils\Config;
-use SimpleSAML\Utils\Crypto;
+use SimpleSAML\Utils;
 //use SoapClient as BuiltinSoapClient;
 use SOAP_1_1;
 
@@ -58,17 +57,20 @@ public function send(Message $msg, Configuration $srcMetadata, Configuration $ds
         if ($srcMetadata->hasValue('saml.SOAPClient.certificate')) {
             $cert = $srcMetadata->getValue('saml.SOAPClient.certificate');
             if ($cert !== false) {
-                $ctxOpts['ssl']['local_cert'] = Config::getCertPath(
+                $configUtils = new Utils\Config();
+                $ctxOpts['ssl']['local_cert'] = $configUtils->getCertPath(
                     $srcMetadata->getString('saml.SOAPClient.certificate')
                 );
                 if ($srcMetadata->hasValue('saml.SOAPClient.privatekey_pass')) {
                     $ctxOpts['ssl']['passphrase'] = $srcMetadata->getString('saml.SOAPClient.privatekey_pass');
                 }
             }
         } else {
+            $cryptoUtils = new Utils\Crypto();
+
             /* Use the SP certificate and privatekey if it is configured. */
-            $privateKey = Crypto::loadPrivateKey($srcMetadata);
-            $publicKey = Crypto::loadPublicKey($srcMetadata);
+            $privateKey = $cryptoUtils->loadPrivateKey($srcMetadata);
+            $publicKey = $cryptoUtils->loadPublicKey($srcMetadata);
             if ($privateKey !== null && $publicKey !== null && isset($publicKey['PEM'])) {
                 $keyCertData = $privateKey['PEM'].$publicKey['PEM'];
                 $file = $container->getTempDir().'/'.sha1($keyCertData).'.pem';