Improve code base

Author: vuongxuongminh

src/AbstractExtractor.php

@@ -14,6 +14,10 @@
 
 abstract class AbstractExtractor implements ExtractorInterface
 {
+    public const IN_HEADER = 'header';
+
+    public const IN_QUERY_PARAM = 'query_param';
+
     private string $in;
 
     private string $item;
@@ -29,8 +33,8 @@ public function __construct(
             throw new \LogicException('Issuer can not be blank!');
         }
 
-        if (ExtractorInterface::IN_HEADER !== $in && ExtractorInterface::IN_QUERY_PARAM !== $in) {
-            throw new \LogicException(sprintf('Origin token must in: `%s` or `%s`, can not in: `%s`', ExtractorInterface::IN_HEADER, ExtractorInterface::IN_QUERY_PARAM, $in));
+        if (self::IN_HEADER !== $in && self::IN_QUERY_PARAM !== $in) {
+            throw new \LogicException(sprintf('Origin token must in: `%s` or `%s`, can not in: `%s`', self::IN_HEADER, self::IN_QUERY_PARAM, $in));
         }
 
         $this->issuer = $issuer;
@@ -41,8 +45,8 @@ public function __construct(
     final public function extract(ServerRequestInterface $request): ?array
     {
         $value = match ($this->in) {
-            ExtractorInterface::IN_HEADER => $request->getHeader($this->item)[0] ?? null,
-            ExtractorInterface::IN_QUERY_PARAM => $request->getQueryParams()[$this->item] ?? null
+            self::IN_HEADER => $request->getHeader($this->item)[0] ?? null,
+            self::IN_QUERY_PARAM => $request->getQueryParams()[$this->item] ?? null
         };
 
         if (false === is_string($value)) {

src/Base64HeaderExtractor.php

@@ -14,7 +14,7 @@ final class Base64HeaderExtractor extends AbstractExtractor
 {
     public function __construct(string $issuer, string $item)
     {
-        parent::__construct($issuer, ExtractorInterface::IN_HEADER, $item);
+        parent::__construct($issuer, self::IN_HEADER, $item);
     }
 
     protected function extractFromValue(string $value): ?array

src/ExtractorFactory.php

@@ -12,22 +12,22 @@
 
 class ExtractorFactory
 {
-    public static function fromBase64Header(string $issuer, string $header): Base64HeaderExtractor
+    public static function fromBase64Header(string $issuer, string $header): ExtractorInterface
     {
         return new Base64HeaderExtractor($issuer, $header);
     }
 
-    public static function fromOriginTokenHeader(string $issuer, string $header): OriginTokenExtractor
+    public static function fromOriginTokenHeader(string $issuer, string $header): ExtractorInterface
     {
-        return new OriginTokenExtractor($issuer, ExtractorInterface::IN_HEADER, $header);
+        return new OriginTokenExtractor($issuer, AbstractExtractor::IN_HEADER, $header);
     }
 
-    public static function fromOriginTokenQueryParam(string $issuer, string $queryParam): OriginTokenExtractor
+    public static function fromOriginTokenQueryParam(string $issuer, string $queryParam): ExtractorInterface
     {
-        return new OriginTokenExtractor($issuer, ExtractorInterface::IN_QUERY_PARAM, $queryParam);
+        return new OriginTokenExtractor($issuer, AbstractExtractor::IN_QUERY_PARAM, $queryParam);
     }
 
-    public static function fromExtractors(ExtractorInterface ...$extractors): CompositeExtractor
+    public static function fromExtractors(ExtractorInterface ...$extractors): ExtractorInterface
     {
         return new CompositeExtractor($extractors);
     }

src/ExtractorInterface.php

@@ -14,9 +14,8 @@
 
 interface ExtractorInterface
 {
-    public const IN_HEADER = 'header';
-
-    public const IN_QUERY_PARAM = 'query_param';
-
+    /*
+     * Extract JWT payload from server request.
+     */
     public function extract(ServerRequestInterface $request): ?array;
 }

tests/OriginTokenExtractorTest.php

@@ -10,7 +10,7 @@
 
 namespace Istio\JWTPayloadExtractor\Tests;
 
-use Istio\JWTPayloadExtractor\ExtractorInterface;
+use Istio\JWTPayloadExtractor\AbstractExtractor;
 use Istio\JWTPayloadExtractor\OriginTokenExtractor;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -31,7 +31,7 @@ public function testInitWithInvalidIn(): void
     {
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessageMatches(
-            sprintf('~`%s` or `%s`~', ExtractorInterface::IN_HEADER, ExtractorInterface::IN_QUERY_PARAM)
+            sprintf('~`%s` or `%s`~', AbstractExtractor::IN_HEADER, AbstractExtractor::IN_QUERY_PARAM)
         );
 
         new OriginTokenExtractor('valid', 'invalid', 'authorization');
@@ -65,8 +65,8 @@ public function testExtractFromValidRequests(ServerRequestInterface $inHeader, S
 
     private function extractRequests(ServerRequestInterface $inHeader, ServerRequestInterface $inQueryParam): array
     {
-        $headerExtractor = new OriginTokenExtractor('valid', ExtractorInterface::IN_HEADER, 'authorization');
-        $queryParamExtractor = new OriginTokenExtractor('valid', ExtractorInterface::IN_QUERY_PARAM, 'token');
+        $headerExtractor = new OriginTokenExtractor('valid', AbstractExtractor::IN_HEADER, 'authorization');
+        $queryParamExtractor = new OriginTokenExtractor('valid', AbstractExtractor::IN_QUERY_PARAM, 'token');
 
         return [$headerExtractor->extract($inHeader), $queryParamExtractor->extract($inQueryParam)];
     }