diff --git a/lib/SimpleSAML/Bindings/Shib13/Artifact.php b/lib/SimpleSAML/Bindings/Shib13/Artifact.php
index 3ce30d977fbb3d902817729e0a071af86eb85864..30d7d130bf0d083388dbf9a16448ea61a2f5f13a 100644
--- a/lib/SimpleSAML/Bindings/Shib13/Artifact.php
+++ b/lib/SimpleSAML/Bindings/Shib13/Artifact.php
@@ -181,8 +181,8 @@ class Artifact
         ];
 
         // Fetch the artifact
-        $response = HTTP::fetch($url, $opts);
         /** @var string $response */
+        $response = HTTP::fetch($url, $opts);
         XML::debugSAMLMessage($response, 'in');
 
         // Find the response in the SOAP message
diff --git a/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php b/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
index 893682c1b8569bb0eb2e619f4f38a1b453e79c73..bc1a4b04f8580e135f6be3a4ccace51e2377c84c 100644
--- a/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
+++ b/lib/SimpleSAML/Bindings/Shib13/HTTPPost.php
@@ -20,12 +20,12 @@ use SimpleSAML\XML\Signer;
 class HTTPPost
 {
     /**
-     * @var \SimpleSAML\Configuration
+     * @var \SimpleSAML\Configuration|null
      */
     private $configuration = null;
 
     /**
-     * @var \SimpleSAML\Metadata\MetaDataStorageHandler
+     * @var \SimpleSAML\Metadata\MetaDataStorageHandler|null
      */
     private $metadata = null;
 
@@ -53,6 +53,7 @@ class HTTPPost
      * @param \SimpleSAML\Configuration $spmd The metadata of the SP which is receiving the response.
      * @param string|null               $relayState The relaystate for the SP.
      * @param string                    $shire The shire which should receive the response.
+     * @return void
      */
     public function sendResponse(
         $response,