Some general tidyup

README.md

@@ -21,11 +21,11 @@ This is best placed in an application startup file.
 ```php
 use HttpSignatures\Context;
 
-$context = new Context(array(
-  'keys' => array('examplekey' => 'secret-key-here'),
+$context = new Context([
+  'keys' => ['examplekey' => 'secret-key-here'],
   'algorithm' => 'hmac-sha256',
-  'headers' => array('(request-target)', 'Date', 'Accept'),
-));
+  'headers' => ['(request-target)', 'Date', 'Accept'],
+]);
 ```
 
 If there's only one key in the `keys` hash, that will be used for signing.

src/Algorithm.php

@@ -2,13 +2,8 @@
 
 namespace HttpSignatures;
 
-class Algorithm
+abstract class Algorithm
 {
-    private function __construct()
-    {
-        // static class.
-    }
-
     /**
      * @param string $name
      *

tests/ContextTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace HttpSignatures\Tests;
+namespace HttpSignatures\tests;
 
 use GuzzleHttp\Psr7\Request;
 use HttpSignatures\Context;
@@ -11,24 +11,24 @@ class ContextTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->context = new Context(array(
-            'keys' => array('pda' => 'secret'),
+        $this->context = new Context([
+            'keys' => ['pda' => 'secret'],
             'algorithm' => 'hmac-sha256',
-            'headers' => array('(request-target)', 'date'),
-        ));
+            'headers' => ['(request-target)', 'date'],
+        ]);
     }
 
     public function testSigner()
     {
         $message = new Request('GET', '/path?query=123', ['date' => 'today', 'accept' => 'llamas']);
         $message = $this->context->signer()->sign($message);
 
-        $expectedString = implode(',', array(
+        $expectedString = implode(',', [
             'keyId="pda"',
             'algorithm="hmac-sha256"',
             'headers="(request-target) date"',
             'signature="SFlytCGpsqb/9qYaKCQklGDvwgmrwfIERFnwt+yqPJw="',
-        ));
+        ]);
 
         $this->assertEquals(
             $expectedString,

tests/HeaderListTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace HttpSignatures\Tests;
+namespace HttpSignatures\tests;
 
 use HttpSignatures\HeaderList;
 
 class HeaderListTest extends \PHPUnit_Framework_TestCase
 {
     public function testToString()
     {
-        $hl = new HeaderList(array('(request-target)', 'Date'));
+        $hl = new HeaderList(['(request-target)', 'Date']);
         $this->assertEquals('(request-target) date', $hl->string());
     }
 

tests/KeyStoreTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace HttpSignatures\Tests;
+namespace HttpSignatures\tests;
 
 use HttpSignatures\KeyStore;
 
 class KeyStoreTest extends \PHPUnit_Framework_TestCase
 {
     public function testFetchSuccess()
     {
-        $ks = new KeyStore(array('id' => 'secret'));
+        $ks = new KeyStore(['id' => 'secret']);
         $key = $ks->fetch('id');
         $this->assertEquals('id', $key->id);
         $this->assertEquals('secret', $key->secret);
@@ -19,7 +19,7 @@ public function testFetchSuccess()
      */
     public function testFetchFail()
     {
-        $ks = new KeyStore(array('id' => 'secret'));
+        $ks = new KeyStore(['id' => 'secret']);
         $key = $ks->fetch('nope');
     }
 }

tests/SignatureParametersParserTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace HttpSignatures\Tests;
+namespace HttpSignatures\tests;
 
 use HttpSignatures\SignatureParametersParser;
 
@@ -12,12 +12,12 @@ public function testParseReturnsExpectedAssociativeArray()
             'keyId="example",algorithm="hmac-sha1",headers="(request-target) date",signature="b64"'
         );
         $this->assertEquals(
-            array(
+            [
                 'keyId' => 'example',
                 'algorithm' => 'hmac-sha1',
                 'headers' => '(request-target) date',
                 'signature' => 'b64',
-            ),
+            ],
             $parser->parse()
         );
     }

tests/SignatureParametersTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace HttpSignatures\Tests;
+namespace HttpSignatures\tests;
 
-use HttpSignatures\HmacAlgorithm;
 use HttpSignatures\HeaderList;
+use HttpSignatures\HmacAlgorithm;
 use HttpSignatures\Key;
 use HttpSignatures\SignatureParameters;
 
@@ -13,7 +13,7 @@ public function testToString()
     {
         $key = new Key('pda', 'secret');
         $algorithm = new HmacAlgorithm('sha256');
-        $headerList = new HeaderList(array('(request-target)', 'date'));
+        $headerList = new HeaderList(['(request-target)', 'date']);
 
         $signature = $this->getMockBuilder('HttpSignatures\Signature')
             ->disableOriginalConstructor()

tests/SigningStringTest.php

@@ -1,19 +1,18 @@
 <?php
 
-namespace HttpSignatures\Tests;
+namespace HttpSignatures\tests;
 
 use GuzzleHttp\Psr7\Request;
 use HttpSignatures\HeaderList;
 use HttpSignatures\HttpMessageFactory;
 use HttpSignatures\SigningString;
-use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
 class SigningStringTest extends \PHPUnit_Framework_TestCase
 {
     public function testWithoutQueryString()
     {
-        $headerList = new HeaderList(array('(request-target)'));
+        $headerList = new HeaderList(['(request-target)']);
         $ss = new SigningString($headerList, $this->message('/path'));
 
         $this->assertEquals(
@@ -24,7 +23,7 @@ public function testWithoutQueryString()
 
     public function testSigningStringWithOrderedQueryParameters()
     {
-        $headerList = new HeaderList(array('(request-target)', 'date'));
+        $headerList = new HeaderList(['(request-target)', 'date']);
         $ss = new SigningString($headerList, $this->message('/path?a=antelope&z=zebra'));
 
         $this->assertEquals(
@@ -35,7 +34,7 @@ public function testSigningStringWithOrderedQueryParameters()
 
     public function testSigningStringWithUnorderedQueryParameters()
     {
-        $headerList = new HeaderList(array('(request-target)', 'date'));
+        $headerList = new HeaderList(['(request-target)', 'date']);
         $ss = new SigningString($headerList, $this->message('/path?z=zebra&a=antelope'));
 
         $this->assertEquals(
@@ -46,7 +45,7 @@ public function testSigningStringWithUnorderedQueryParameters()
 
     public function testSigningStringWithOrderedQueryParametersSymfonyRequest()
     {
-        $headerList = new HeaderList(array('(request-target)', 'date'));
+        $headerList = new HeaderList(['(request-target)', 'date']);
         $ss = new SigningString($headerList, $this->symfonyMessage('/path?a=antelope&z=zebra'));
 
         $this->assertEquals(
@@ -57,7 +56,7 @@ public function testSigningStringWithOrderedQueryParametersSymfonyRequest()
 
     public function testSigningStringWithUnorderedQueryParametersSymfonyRequest()
     {
-        $headerList = new HeaderList(array('(request-target)', 'date'));
+        $headerList = new HeaderList(['(request-target)', 'date']);
         $ss = new SigningString($headerList, $this->symfonyMessage('/path?z=zebra&a=antelope'));
 
         $this->assertEquals(
@@ -71,7 +70,7 @@ public function testSigningStringWithUnorderedQueryParametersSymfonyRequest()
      */
     public function testSigningStringErrorForMissingHeader()
     {
-        $headerList = new HeaderList(array('nope'));
+        $headerList = new HeaderList(['nope']);
         $ss = new SigningString($headerList, $this->message('/'));
         $ss->string();
     }
@@ -84,7 +83,7 @@ private function message($path)
     private function symfonyMessage($path)
     {
         $symfonyRequest = SymfonyRequest::create($path, 'GET');
-        $symfonyRequest->headers->replace(array('date' => 'Mon, 28 Jul 2014 15:39:13 -0700'));
+        $symfonyRequest->headers->replace(['date' => 'Mon, 28 Jul 2014 15:39:13 -0700']);
 
         $psr7Factory = new HttpMessageFactory();
         $psrRequest = $psr7Factory->createRequest($symfonyRequest);

tests/VerifierTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace HttpSignatures\Tests;
+namespace HttpSignatures\tests;
 
 use GuzzleHttp\Psr7\Request;
 use HttpSignatures\KeyStore;
@@ -29,7 +29,7 @@ public function setUp()
 
     private function setUpVerifier()
     {
-        $keyStore = new KeyStore(array("pda" => "secret"));
+        $keyStore = new KeyStore(["pda" => "secret"]);
         $this->verifier = new Verifier($keyStore);
     }
 
@@ -103,7 +103,7 @@ public function testRejectMessageWithPartialSignatureHeader()
 
     public function testRejectsMessageWithUnknownKeyId()
     {
-        $keyStore = new KeyStore(array("nope" => "secret"));
+        $keyStore = new KeyStore(["nope" => "secret"]);
         $verifier = new Verifier($keyStore);
         $this->assertFalse($verifier->isValid($this->message));
     }