No need for an AbstractSignature

radford · May 8, 2015 · 5524cb6 · 5524cb6
1 parent 12d1058
commit 5524cb6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 42 deletions.
diff --git a/src/Signature/AbstractSignature.php b/src/Signature/AbstractSignature.php
diff --git a/src/Signature/S3Signature.php b/src/Signature/S3Signature.php
@@ -11,7 +11,7 @@
  * Default Amazon S3 signature implementation
  * @link http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html
  */
-class S3Signature extends AbstractSignature
+class S3Signature implements SignatureInterface
 {
     /** @var array Query string values that must be signed */
     private $signableQueryString = [

diff --git a/src/Signature/SignatureV2.php b/src/Signature/SignatureV2.php
@@ -9,7 +9,7 @@
  * Implementation of Signature Version 2
  * @link http://aws.amazon.com/articles/1928
  */
-class SignatureV2 extends AbstractSignature
+class SignatureV2 implements SignatureInterface
 {
     public function signRequest(
         RequestInterface $request,
@@ -43,6 +43,14 @@ public function signRequest(
         return $request->withBody(Psr7\stream_for(http_build_query($params)));
     }
 
+    public function createPresignedUrl(
+        RequestInterface $request,
+        CredentialsInterface $credentials,
+        $expires
+    ) {
+        throw new \BadMethodCallException(__METHOD__ . ' not implemented');
+    }
+
     private function getCanonicalizedParameterString(array $params)
     {
         unset($params['Signature']);

diff --git a/src/Signature/SignatureV4.php b/src/Signature/SignatureV4.php
@@ -10,7 +10,7 @@
  * Signature Version 4
  * @link http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
  */
-class SignatureV4 extends AbstractSignature
+class SignatureV4 implements SignatureInterface
 {
     const ISO8601_BASIC = 'Ymd\THis\Z';
 

diff --git a/tests/Signature/AbstractSignatureTest.php b/tests/Signature/AbstractSignatureTest.php
diff --git a/tests/Signature/SignatureV2Test.php b/tests/Signature/SignatureV2Test.php
@@ -35,4 +35,15 @@ public function testSignsRequestsWithSecurityToken()
             . "Test=123&Other=456&Timestamp=Fri%2C+09+Sep+2011+23%3A36%3A00+GMT&SignatureVersion=2&SignatureMethod=HmacSHA256&AWSAccessKeyId=AKIDEXAMPLE&SecurityToken=foo&Signature=NzQ9b5Kx6qlKj2UIK6QHIrmq5ypogh9PhBHVXKA4RU4%3D";
         $this->assertEquals($expected, Psr7\str($result));
     }
+
+    /**
+     * @expectedException \BadMethodCallException
+     */
+    public function testThrowsWhenNotImplemented()
+    {
+        $mock = $sig = new SignatureV2();
+        $request = new Request('GET', 'http://foo.com');
+        $credentials = new Credentials('foo', 'bar');
+        $mock->createPresignedUrl($request, $credentials, '+10 minutes');
+    }
 }