Replace status-code dependency

This allows http-message 2 upgrade.
usox · Nov 12, 2023 · 1d572a9 · 1d572a9
1 parent ec06ba8
commit 1d572a9
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 103 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "psr/http-server-handler": "^1.0",
     "psr/log": "^1.1||^3",
     "ramsey/uuid": "^4.1",
-    "shrikeh/teapot": "^2.3"
+    "teapot/status-code": "^1.1"
   },
   "autoload": {
     "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Dispatch/MethodDispatcher.php b/src/Dispatch/MethodDispatcher.php
@@ -7,7 +7,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use stdClass;
-use Teapot\StatusCode;
+use Teapot\StatusCode\Http;
 use Usox\JsonSchemaApi\Contract\ApiMethodInterface;
 use Usox\JsonSchemaApi\Contract\MethodProviderInterface;
 use Usox\JsonSchemaApi\Dispatch\Exception\SchemaInvalidException;
@@ -65,7 +65,7 @@ public function dispatch(
         if (!$handler instanceof ApiMethodInterface) {
             throw new MethodNotFoundException(
                 'Method not found',
-                StatusCode::BAD_REQUEST
+                Http::BAD_REQUEST
             );
         }
 

diff --git a/src/Dispatch/MethodValidator.php b/src/Dispatch/MethodValidator.php
@@ -8,7 +8,7 @@
 use Opis\JsonSchema\Helper;
 use Opis\JsonSchema\Validator;
 use stdClass;
-use Teapot\StatusCode;
+use Teapot\StatusCode\Http;
 use Usox\JsonSchemaApi\Exception\RequestMalformedException;
 use Usox\JsonSchemaApi\Exception\ResponseMalformedException;
 
@@ -40,7 +40,7 @@ public function validateInput(
         if (!$validationResult->isValid()) {
             throw new RequestMalformedException(
                 'Bad Request',
-                StatusCode::BAD_REQUEST
+                Http::BAD_REQUEST
             );
         }
     }
@@ -78,7 +78,7 @@ public function validateOutput(
             if ($error !== null) {
                 throw new ResponseMalformedException(
                     'Internal Server Error',
-                    StatusCode::INTERNAL_SERVER_ERROR,
+                    Http::INTERNAL_SERVER_ERROR,
                     null,
                     $this->errorFormatter->format($error)
                 );

diff --git a/src/Dispatch/RequestValidator.php b/src/Dispatch/RequestValidator.php
@@ -4,13 +4,13 @@
 
 namespace Usox\JsonSchemaApi\Dispatch;
 
+use Teapot\StatusCode\Http;
 use Usox\JsonSchemaApi\Dispatch\Exception\SchemaInvalidException;
 use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotFoundException;
 use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotLoadableException;
 use Opis\JsonSchema\Validator;
 use Psr\Http\Message\ServerRequestInterface;
 use stdClass;
-use Teapot\StatusCode;
 use Usox\JsonSchemaApi\Dispatch\Exception\JsonInvalidException;
 use Usox\JsonSchemaApi\Exception\RequestMalformedException;
 
@@ -40,7 +40,7 @@ public function validate(ServerRequestInterface $request): stdClass
         if (json_last_error() !== JSON_ERROR_NONE) {
             throw new JsonInvalidException(
                 sprintf('Input is no valid json (%s)', json_last_error_msg()),
-                StatusCode::BAD_REQUEST
+                Http::BAD_REQUEST
             );
         }
 
@@ -57,7 +57,7 @@ public function validate(ServerRequestInterface $request): stdClass
         if (!$validationResult->isValid()) {
             throw new RequestMalformedException(
                 'Request is invalid',
-                StatusCode::BAD_REQUEST
+                Http::BAD_REQUEST
             );
         }
 

diff --git a/src/Dispatch/SchemaLoader.php b/src/Dispatch/SchemaLoader.php
@@ -4,10 +4,10 @@
 
 namespace Usox\JsonSchemaApi\Dispatch;
 
+use Teapot\StatusCode\Http;
 use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotFoundException;
 use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotLoadableException;
 use stdClass;
-use Teapot\StatusCode;
 use Usox\JsonSchemaApi\Dispatch\Exception\SchemaInvalidException;
 
 /**
@@ -28,7 +28,7 @@ public function load(
         if (!file_exists($schemaFilePath)) {
             throw new SchemaNotFoundException(
                 sprintf('Schema file `%s` not found', $schemaFilePath),
-                StatusCode::INTERNAL_SERVER_ERROR
+                Http::INTERNAL_SERVER_ERROR
             );
         }
 
@@ -37,7 +37,7 @@ public function load(
         if ($fileContent === false) {
             throw new SchemaNotLoadableException(
                 sprintf('Schema file `%s` not loadable', $schemaFilePath),
-                StatusCode::INTERNAL_SERVER_ERROR
+                Http::INTERNAL_SERVER_ERROR
             );
         }
 
@@ -47,7 +47,7 @@ public function load(
         if (json_last_error() !== JSON_ERROR_NONE) {
             throw new SchemaInvalidException(
                 sprintf('Schema does not contain valid json (%s)', json_last_error_msg()),
-                StatusCode::INTERNAL_SERVER_ERROR
+                Http::INTERNAL_SERVER_ERROR
             );
         }
 

diff --git a/src/Endpoint.php b/src/Endpoint.php
@@ -15,7 +15,7 @@
 use Ramsey\Uuid\UuidFactory;
 use Ramsey\Uuid\UuidFactoryInterface;
 use Ramsey\Uuid\UuidInterface;
-use Teapot\StatusCode;
+use Teapot\StatusCode\Http;
 use Throwable;
 use Usox\JsonSchemaApi\Contract\MethodProviderInterface;
 use Usox\JsonSchemaApi\Dispatch\MethodDispatcher;
@@ -52,7 +52,7 @@ public function __construct(
     public function serve(
         ServerRequestInterface $request,
     ): ResponseInterface {
-        $statusCode = StatusCode::OK;
+        $statusCode = Http::OK;
         $responseData = null;
 
         try {
@@ -71,22 +71,22 @@ public function serve(
             // Build an error response
             $responseData = $this->responseBuilder->buildErrorResponse($e, $uuid);
 
-            $statusCode = StatusCode::BAD_REQUEST;
+            $statusCode = Http::BAD_REQUEST;
         } catch (InternalException $e) {
             $this->logError(
                 $e,
                 $this->uuidFactory->uuid4(),
                 $e->getContext()
             );
 
-            $statusCode = StatusCode::INTERNAL_SERVER_ERROR;
+            $statusCode = Http::INTERNAL_SERVER_ERROR;
         } catch (Throwable $e) {
             $this->logError(
                 $e,
                 $this->uuidFactory->uuid4()
             );
 
-            $statusCode = StatusCode::INTERNAL_SERVER_ERROR;
+            $statusCode = Http::INTERNAL_SERVER_ERROR;
         }
 
         $response = $this->responseFactory->createResponse($statusCode);

diff --git a/tests/Dispatch/MethodDispatcherTest.php b/tests/Dispatch/MethodDispatcherTest.php
@@ -9,7 +9,7 @@
 use Mockery\MockInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
-use Teapot\StatusCode;
+use Teapot\StatusCode\Http;
 use Usox\JsonSchemaApi\Contract\ApiMethodInterface;
 use Usox\JsonSchemaApi\Contract\MethodProviderInterface;
 use Usox\JsonSchemaApi\Exception\MethodNotFoundException;
@@ -50,7 +50,7 @@ public function testDispatchThrowsExceptionIfMethodDoesNotExist(): void
 
         $this->expectException(MethodNotFoundException::class);
         $this->expectExceptionMessage('Method not found');
-        $this->expectExceptionCode(StatusCode::BAD_REQUEST);
+        $this->expectExceptionCode(Http::BAD_REQUEST);
 
         $method = 'some-method';
         $parameter = (object) ['some-parameter'];

diff --git a/tests/Dispatch/MethodValidatorTest.php b/tests/Dispatch/MethodValidatorTest.php
@@ -11,7 +11,7 @@
 use Opis\JsonSchema\Errors\ValidationError;
 use Opis\JsonSchema\ValidationResult;
 use Opis\JsonSchema\Validator;
-use Teapot\StatusCode;
+use Teapot\StatusCode\Http;
 use Usox\JsonSchemaApi\Exception\RequestMalformedException;
 use Usox\JsonSchemaApi\Exception\ResponseMalformedException;
 
@@ -46,7 +46,7 @@ public function testValidateInputThrowsExceptionIfInputDoesNotValidate(): void
 
         $this->expectException(RequestMalformedException::class);
         $this->expectExceptionMessage('Bad Request');
-        $this->expectExceptionCode(StatusCode::BAD_REQUEST);
+        $this->expectExceptionCode(Http::BAD_REQUEST);
 
         $this->schemaValidator->shouldReceive('validate')
             ->with(
@@ -111,7 +111,7 @@ public function testValidateOutputThrowsExceptionIfOutputDoesNotValidate(): void
 
         $this->expectException(ResponseMalformedException::class);
         $this->expectExceptionMessage('Internal Server Error');
-        $this->expectExceptionCode(StatusCode::INTERNAL_SERVER_ERROR);
+        $this->expectExceptionCode(Http::INTERNAL_SERVER_ERROR);
 
         $this->schemaValidator->shouldReceive('validate')
             ->with(

diff --git a/tests/Dispatch/RequestValidatorTest.php b/tests/Dispatch/RequestValidatorTest.php
@@ -11,7 +11,7 @@
 use Opis\JsonSchema\Validator;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
-use Teapot\StatusCode;
+use Teapot\StatusCode\Http;
 use Usox\JsonSchemaApi\Dispatch\Exception\JsonInvalidException;
 use Usox\JsonSchemaApi\Exception\RequestMalformedException;
 
@@ -40,7 +40,7 @@ public function testValidateThrowsExceptionIfInputIsInvalid(): void
     {
         $this->expectException(JsonInvalidException::class);
         $this->expectExceptionMessage('Input is no valid json (Syntax error)');
-        $this->expectExceptionCode(StatusCode::BAD_REQUEST);
+        $this->expectExceptionCode(Http::BAD_REQUEST);
 
         $stream = Mockery::mock(StreamInterface::class);
         $request = Mockery::mock(ServerRequestInterface::class);
@@ -64,7 +64,7 @@ public function testValidateThrowsExceptionIfInputDoesNotValidate(): void
     {
         $this->expectException(RequestMalformedException::class);
         $this->expectExceptionMessage('Request is invalid');
-        $this->expectExceptionCode(StatusCode::BAD_REQUEST);
+        $this->expectExceptionCode(Http::BAD_REQUEST);
 
         $stream = Mockery::mock(StreamInterface::class);
         $request = Mockery::mock(ServerRequestInterface::class);