Minor cleanup of dead code and documentation.

src/Signer/Signer.php

@@ -79,6 +79,7 @@ public function __construct($self_key, $client_id, $client_secret, $hash_algo =
      */
     public function getSelfKey()
     {
+        /** @var string */
         return $this->self_key;
     }
 
@@ -89,6 +90,7 @@ public function getSelfKey()
      */
     public function getClientId()
     {
+        /** @var string */
         return $this->client_id;
     }
 
@@ -99,6 +101,7 @@ public function getClientId()
      */
     public function getClientSecret()
     {
+        /** @var string */
         return $this->client_secret;
     }
 
@@ -115,6 +118,7 @@ public function sign(array $payload)
 
         $signature = hash_hmac($this->hash_algo, $s2s, $signing_key);
 
+        /** @var string */
         return $signature;
     }
 
@@ -124,6 +128,7 @@ public function sign(array $payload)
 
     private function createStringToSign($self_key, $client_id, $scope, $context)
     {
+        /** @var string */
         return sprintf(
             "SIGNER-HMAC-SHA512\n%s\n%s\n%s\n%s",
             $self_key,
@@ -154,6 +159,7 @@ private function createContext(array $payload)
         $signed_headers_string = implode(';', array_keys($canonical_payload));
         $canon = implode("\n", $canonical_payload) . "\n\n" . $signed_headers_string;
 
+        /** @var string */
         return $canon;
     }
 
@@ -167,16 +173,11 @@ private function createContext(array $payload)
      */
     private function getSigningSalt($self_key, $client_id, $client_secret)
     {
-        $k = implode('_', [
-            $self_key,
-            $client_id,
-            $client_secret
-        ]);
-
         $self_key_sign = hash_hmac($this->hash_algo, $self_key, $client_secret, true);
         $client_id_sign = hash_hmac($this->hash_algo, $client_id, $self_key_sign, true);
         $salt = hash_hmac($this->hash_algo, 'signer', $client_id_sign, true);
 
+        /** @var string */
         return $salt;
     }
 
@@ -189,6 +190,7 @@ private function getSigningSalt($self_key, $client_id, $client_secret)
      */
     private function createScope($self_key, $client_id)
     {
+        /** @var string */
         return sprintf(
             "%s/%s/signer",
             $self_key,

tests/Signer/SignerTest.php

@@ -12,12 +12,20 @@
 
 class SignerTest extends PHPUnit_Framework_TestCase
 {
+    /** @var string */
     const DEFAULT_SELF_KEY = 'Skyzyx';
+
+    /** @var string */
     const DEFAULT_CLIENT_ID = 'k3qDQy0Tr56v1ceo';
+
+    /** @var string */
     const DEFAULT_CLIENT_SECRET = 'O5j@pG@Jt%AzyiJTEfo!£LSz8yqSj)JX)S6FvW%58KjlS9bc%Fi7&&C4KSCT8hxd';
+
+    /** @var string */
     const DEFAULT_SIGNATURE = "dfbffab5b6f7156402da8147886bba3eba67bd5baf2e780ba9d39e8437db7c4735e9a0b834aa21ac76f98da8c52a2a0cd1b0192d0f0df5c98e3848b1b2e1a037";
 
-    public $signer = '';
+    /** @var \Skyzyx\Signer\Signer */
+    public $signer;
 
     public function setUp()
     {