From 46ceca53603aa7637cdbfdebae113684b6619780 Mon Sep 17 00:00:00 2001
From: Adrian Palmer <navitronic@gmail.com>
Date: Mon, 17 Oct 2016 13:32:47 +1100
Subject: [PATCH] Use RequestInterface instead of MessageInterface

---
 src/Algorithm.php     |  2 --
 src/Signature.php     |  6 +++---
 src/Signer.php        | 12 ++++++------
 src/SigningString.php |  2 +-
 src/Verification.php  |  8 ++++----
 src/Verifier.php      |  6 +++---
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/Algorithm.php b/src/Algorithm.php
index b35d768..9c0a3e3 100644
--- a/src/Algorithm.php
+++ b/src/Algorithm.php
@@ -6,9 +6,7 @@ abstract class Algorithm
 {
     /**
      * @param string $name
-     *
      * @return HmacAlgorithm
-     *
      * @throws Exception
      */
     public static function create($name)
diff --git a/src/Signature.php b/src/Signature.php
index 43af8d1..8b0b89c 100644
--- a/src/Signature.php
+++ b/src/Signature.php
@@ -2,7 +2,7 @@
 
 namespace HttpSignatures;
 
-use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\RequestInterface;
 
 class Signature
 {
@@ -16,12 +16,12 @@ class Signature
     private $signingString;
 
     /**
-     * @param MessageInterface $message
+     * @param RequestInterface $message
      * @param Key $key
      * @param AlgorithmInterface $algorithm
      * @param HeaderList $headerList
      */
-    public function __construct(MessageInterface $message, Key $key, AlgorithmInterface $algorithm, HeaderList $headerList)
+    public function __construct($message, Key $key, AlgorithmInterface $algorithm, HeaderList $headerList)
     {
         $this->key = $key;
         $this->algorithm = $algorithm;
diff --git a/src/Signer.php b/src/Signer.php
index d59027a..8cbf626 100644
--- a/src/Signer.php
+++ b/src/Signer.php
@@ -2,7 +2,7 @@
 
 namespace HttpSignatures;
 
-use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\RequestInterface;
 
 class Signer
 {
@@ -28,10 +28,10 @@ public function __construct($key, $algorithm, $headerList)
     }
 
     /**
-     * @param MessageInterface $message
-     * @return MessageInterface
+     * @param RequestInterface $message
+     * @return RequestInterface
      */
-    public function sign(MessageInterface $message)
+    public function sign($message)
     {
         $signatureParameters = $this->signatureParameters($message);
         $message = $message->withAddedHeader("Signature", $signatureParameters->string());
@@ -40,7 +40,7 @@ public function sign(MessageInterface $message)
     }
 
     /**
-     * @param MessageInterface $message
+     * @param RequestInterface $message
      * @return SignatureParameters
      */
     private function signatureParameters($message)
@@ -54,7 +54,7 @@ private function signatureParameters($message)
     }
 
     /**
-     * @param MessageInterface $message
+     * @param RequestInterface $message
      * @return Signature
      */
     private function signature($message)
diff --git a/src/SigningString.php b/src/SigningString.php
index 3bd9d26..44c4015 100644
--- a/src/SigningString.php
+++ b/src/SigningString.php
@@ -16,7 +16,7 @@ class SigningString
      * @param HeaderList $headerList
      * @param RequestInterface $message
      */
-    public function __construct(HeaderList $headerList, RequestInterface $message)
+    public function __construct(HeaderList $headerList, $message)
     {
         $this->headerList = $headerList;
         $this->message = $message;
diff --git a/src/Verification.php b/src/Verification.php
index 24c00e8..bd1b76c 100644
--- a/src/Verification.php
+++ b/src/Verification.php
@@ -2,11 +2,11 @@
 
 namespace HttpSignatures;
 
-use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\RequestInterface;
 
 class Verification
 {
-    /** @var MessageInterface */
+    /** @var RequestInterface */
     private $message;
 
     /** @var KeyStoreInterface */
@@ -16,10 +16,10 @@ class Verification
     private $_parameters;
 
     /**
-     * @param MessageInterface $message
+     * @param RequestInterface $message
      * @param KeyStoreInterface $keyStore
      */
-    public function __construct(MessageInterface $message, $keyStore)
+    public function __construct($message, KeyStoreInterface $keyStore)
     {
         $this->message = $message;
         $this->keyStore = $keyStore;
diff --git a/src/Verifier.php b/src/Verifier.php
index fe40461..7047287 100644
--- a/src/Verifier.php
+++ b/src/Verifier.php
@@ -2,7 +2,7 @@
 
 namespace HttpSignatures;
 
-use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\RequestInterface;
 
 class Verifier
 {
@@ -18,10 +18,10 @@ public function __construct(KeyStoreInterface $keyStore)
     }
 
     /**
-     * @param MessageInterface $message
+     * @param RequestInterface $message
      * @return bool
      */
-    public function isValid(MessageInterface $message)
+    public function isValid($message)
     {
         $verification = new Verification($message, $this->keyStore);