Merge pull request #5 from chadicus/develop

Change namespace of project
chadicus · Sep 21, 2017 · c7bd33e · c7bd33e
2 parents 854a6f3 + d068f07
commit c7bd33e
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -20,9 +20,9 @@
         "php-coveralls/php-coveralls": "^1.0"
     },
     "autoload": {
-        "psr-4": { "Chadicus\\Hmac\\" : "src" }
+        "psr-4": { "Chadicus\\Psr\\Http\\ServerMiddleware\\" : "src" }
     },
     "autoload-dev": {
-        "psr-4": { "ChadicusTest\\Hmac\\" : "tests" }
+        "psr-4": { "ChadicusTest\\Psr\\Http\\ServerMiddleware\\" : "tests" }
     }
 }
diff --git a/src/AuthenticationException.php b/src/AuthenticationException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chadicus\Hmac;
+namespace Chadicus\Psr\Http\ServerMiddleware;
 
 /**
  * Exception to throw when authentication fails.

diff --git a/src/Hmac/AuthorizationHeaderExtractor.php b/src/Hmac/AuthorizationHeaderExtractor.php
@@ -1,6 +1,11 @@
 <?php
 
-namespace Chadicus\Hmac;
+namespace Chadicus\Psr\Http\ServerMiddleware\Hmac;
+
+use Chadicus\Psr\Http\ServerMiddleware\AuthenticationException;
+use Chadicus\Psr\Http\ServerMiddleware\Token;
+use Chadicus\Psr\Http\ServerMiddleware\TokenExtractorInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 /**
  * Token extractor to obtain a token from an authorization header.

diff --git a/src/Hmac/TokenValidator.php b/src/Hmac/TokenValidator.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace Chadicus\Hmac;
+namespace Chadicus\Psr\Http\ServerMiddleware\Hmac;
 
+use Chadicus\Psr\Http\ServerMiddleware\Token;
+use Chadicus\Psr\Http\ServerMiddleware\TokenValidatorInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 /**

diff --git a/src/KeyProviderInterface.php b/src/KeyProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chadicus\Hmac;
+namespace Chadicus\Psr\Http\ServerMiddleware;
 
 /**
  * Interface for private key repositories.

diff --git a/src/Middleware.php b/src/Middleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chadicus\Hmac;
+namespace Chadicus\Psr\Http\ServerMiddleware;
 
 use ArrayAccess;
 use Psr\Http\Message\ServerRequestInterface;

diff --git a/src/Token.php b/src/Token.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chadicus\Hmac;
+namespace Chadicus\Psr\Http\ServerMiddleware;
 
 /**
  * Immutable hmac authentication token.

diff --git a/src/TokenExtractorInterface.php b/src/TokenExtractorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chadicus\Hmac;
+namespace Chadicus\Psr\Http\ServerMiddleware;
 
 use Psr\Http\Message\ServerRequestInterface;
 

diff --git a/src/TokenValidatorInterface.php b/src/TokenValidatorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chadicus\Hmac;
+namespace Chadicus\Psr\Http\ServerMiddleware;
 
 use Psr\Http\Message\ServerRequestInterface;
 

diff --git a/tests/AuthenticationExceptionTest.php b/tests/AuthenticationExceptionTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChadicusTest\Hmac;
+namespace ChadicusTest\Psr\Http\ServerMiddleware;
 
-use Chadicus\Hmac\AuthenticationException;
+use Chadicus\Psr\Http\ServerMiddleware\AuthenticationException;
 
 /**
- * @coversDefaultClass \Chadicus\Hmac\AuthenticationException
+ * @coversDefaultClass \Chadicus\Psr\Http\ServerMiddleware\AuthenticationException
  * @covers ::__construct
  */
 final class AuthenticationExceptionTest extends \PHPUnit\Framework\TestCase

diff --git a/tests/MiddlewareTest.php b/tests/MiddlewareTest.php
@@ -1,14 +1,17 @@
 <?php
 
-namespace ChadicusTest\Hmac;
+namespace ChadicusTest\Psr\Http\ServerMiddleware;
 
 use ArrayObject;
-use Chadicus\Hmac;
+use Chadicus\Psr\Http\ServerMiddleware\AuthenticationException;
+use Chadicus\Psr\Http\ServerMiddleware\Middleware;
+use Chadicus\Psr\Http\ServerMiddleware\Token;
+use Chadicus\Psr\Http\ServerMiddleware;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
 
 /**
- * @coversDefaultClass \Chadicus\Hmac\Middleware
+ * @coversDefaultClass \Chadicus\Psr\Http\ServerMiddleware\Middleware
  * @covers ::__construct
  */
 final class MiddlewareTest extends \PHPUnit\Framework\TestCase
@@ -29,20 +32,20 @@ public function invoke()
         $time = time();
         $signature = md5("{$privateKey}{$nonce}{$time}{$publicKey}");
 
-        $token = new Hmac\Token($publicKey, $signature, $nonce, $time);
+        $token = new Token($publicKey, $signature, $nonce, $time);
 
-        $provider = $this->getMockBuilder('\\Chadicus\\Hmac\\KeyProviderInterface')->getMock();
+        $provider = $this->getMockBuilder('\\Chadicus\\Psr\\Http\\ServerMiddleware\\KeyProviderInterface')->getMock();
         $provider->method('findPrivateKey')->willReturn($privateKey);
 
-        $extractor = $this->getMockBuilder('\\Chadicus\\Hmac\\TokenExtractorInterface')->getMock();
+        $extractor = $this->getMockBuilder('\\Chadicus\\Psr\\Http\\ServerMiddleware\\TokenExtractorInterface')->getMock();
         $extractor->method('extract')->willReturn($token);
 
-        $validator = $this->getMockBuilder('\\Chadicus\\Hmac\\TokenValidatorInterface')->getMock();
+        $validator = $this->getMockBuilder('\\Chadicus\\Psr\\Http\\ServerMiddleware\\TokenValidatorInterface')->getMock();
         $validator->method('validate')->willReturn(true);
 
         $container = new ArrayObject();
 
-        $middleware = new Hmac\Middleware($provider, $extractor, $validator, $container);
+        $middleware = new Middleware($provider, $extractor, $validator, $container);
 
         $headers = [
             'X-Hmac-Auth' => ["{$publicKey}:{$signature}:{$nonce}:{$time}"],
@@ -77,22 +80,22 @@ public function invokeExceptionThrown()
         $time = time();
         $signature = md5("{$privateKey}{$nonce}{$time}{$publicKey}");
 
-        $token = new Hmac\Token($publicKey, $signature, $nonce, $time);
+        $token = new Token($publicKey, $signature, $nonce, $time);
 
-        $provider = $this->getMockBuilder('\\Chadicus\\Hmac\\KeyProviderInterface')->getMock();
+        $provider = $this->getMockBuilder('\\Chadicus\\Psr\\Http\\ServerMiddleware\\KeyProviderInterface')->getMock();
         $provider->method('findPrivateKey')->willReturn($privateKey);
 
-        $extractor = $this->getMockBuilder('\\Chadicus\\Hmac\\TokenExtractorInterface')->getMock();
+        $extractor = $this->getMockBuilder('\\Chadicus\\Psr\\Http\\ServerMiddleware\\TokenExtractorInterface')->getMock();
         $extractor->method('extract')->willReturn($token);
 
-        $exception = new Hmac\AuthenticationException(400, 'Bad Request');
+        $exception = new AuthenticationException(400, 'Bad Request');
 
-        $validator = $this->getMockBuilder('\\Chadicus\\Hmac\\TokenValidatorInterface')->getMock();
+        $validator = $this->getMockBuilder('\\Chadicus\\Psr\\Http\\ServerMiddleware\\TokenValidatorInterface')->getMock();
         $validator->method('validate')->will($this->throwException($exception));
 
         $container = new ArrayObject();
 
-        $middleware = new Hmac\Middleware($provider, $extractor, $validator, $container);
+        $middleware = new Middleware($provider, $extractor, $validator, $container);
 
         $headers = [
             'X-Hmac-Auth' => ["{$publicKey}:{$signature}:{$nonce}:{$time}"],

diff --git a/tests/TokenTest.php b/tests/TokenTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace ChadicusTest\Hmac;
+namespace ChadicusTest\Psr\Http\ServerMiddleware;
 
-use Chadicus\Hmac\Token;
+use Chadicus\Psr\Http\ServerMiddleware\Token;
 
 /**
- * @coversDefaultClass \Chadicus\Hmac\Token
+ * @coversDefaultClass \Chadicus\Psr\Http\ServerMiddleware\Token
  * @covers ::__construct
  */
 final class TokenTest extends \PHPUnit\Framework\TestCase