Skip to content

Commit 8c42b8c

Browse files
committed
removed laminas/laminas-http dependency
Signed-off-by: MarioRadu <[email protected]>
1 parent 13d758c commit 8c42b8c

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
"require-dev": {
8181
"laminas/laminas-coding-standard": "^2.5",
8282
"laminas/laminas-development-mode": "^3.12.0",
83-
"laminas/laminas-http": "^2.19.0",
8483
"mezzio/mezzio-tooling": "^2.9.0",
8584
"phpstan/phpstan": "^2.0",
8685
"phpstan/phpstan-doctrine": "^2.0",

test/Unit/App/Middleware/AuthorizationMiddlewareTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
use Api\User\Entity\User;
1515
use Api\User\Entity\UserRole;
1616
use Api\User\Repository\UserRepository;
17+
use Fig\Http\Message\StatusCodeInterface;
1718
use Laminas\Diactoros\ServerRequest;
18-
use Laminas\Http\Response;
1919
use Mezzio\Authentication\UserInterface;
2020
use Mezzio\Authorization\AuthorizationInterface;
2121
use PHPUnit\Framework\MockObject\Exception;
@@ -62,7 +62,7 @@ public function testAuthorizationInvalidClientIdProvided(): void
6262
$this->request = $this->request->withAttribute(UserInterface::class, $identity);
6363

6464
$response = $this->subject->process($this->request, $this->handler);
65-
$this->assertSame(Response::STATUS_CODE_403, $response->getStatusCode());
65+
$this->assertSame(StatusCodeInterface::STATUS_FORBIDDEN, $response->getStatusCode());
6666

6767
$data = json_decode($response->getBody()->getContents(), true);
6868
$this->assertArrayHasKey('error', $data);
@@ -82,7 +82,7 @@ public function testAuthorizationInactiveAdmin(): void
8282
$this->request = $this->request->withAttribute(UserInterface::class, $identity);
8383

8484
$response = $this->subject->process($this->request, $this->handler);
85-
$this->assertSame(Response::STATUS_CODE_403, $response->getStatusCode());
85+
$this->assertSame(StatusCodeInterface::STATUS_FORBIDDEN, $response->getStatusCode());
8686

8787
$data = json_decode($response->getBody()->getContents(), true);
8888
$this->assertArrayHasKey('error', $data);
@@ -98,7 +98,7 @@ public function testAuthorizationInactiveUser(): void
9898
$this->request = $this->request->withAttribute(UserInterface::class, $identity);
9999

100100
$response = $this->subject->process($this->request, $this->handler);
101-
$this->assertSame(Response::STATUS_CODE_403, $response->getStatusCode());
101+
$this->assertSame(StatusCodeInterface::STATUS_FORBIDDEN, $response->getStatusCode());
102102

103103
$data = json_decode($response->getBody()->getContents(), true);
104104
$this->assertArrayHasKey('error', $data);
@@ -116,7 +116,7 @@ public function testAuthorizationUserNotFoundOrDeleted(): void
116116
$this->request = $this->request->withAttribute(UserInterface::class, $identity);
117117

118118
$response = $this->subject->process($this->request, $this->handler);
119-
$this->assertSame(Response::STATUS_CODE_403, $response->getStatusCode());
119+
$this->assertSame(StatusCodeInterface::STATUS_FORBIDDEN, $response->getStatusCode());
120120

121121
$data = json_decode($response->getBody()->getContents(), true);
122122
$this->assertArrayHasKey('error', $data);
@@ -139,7 +139,7 @@ public function testAuthorizationNotGranted(): void
139139
$this->request = $this->request->withAttribute(UserInterface::class, $identity);
140140

141141
$response = $this->subject->process($this->request, $this->handler);
142-
$this->assertSame(Response::STATUS_CODE_403, $response->getStatusCode());
142+
$this->assertSame(StatusCodeInterface::STATUS_FORBIDDEN, $response->getStatusCode());
143143

144144
$data = json_decode($response->getBody()->getContents(), true);
145145
$this->assertArrayHasKey('error', $data);

test/Unit/App/Middleware/ContentNegotiationMiddlewareTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
namespace ApiTest\Unit\App\Middleware;
66

77
use Api\App\Middleware\ContentNegotiationMiddleware as Subject;
8+
use Fig\Http\Message\StatusCodeInterface;
89
use Laminas\Diactoros\ServerRequest;
9-
use Laminas\Http\Response;
1010
use Mezzio\Router\Route;
1111
use Mezzio\Router\RouteResult;
1212
use PHPUnit\Framework\MockObject\Exception;
@@ -66,7 +66,7 @@ public function testWrongAccept(): void
6666
);
6767
$request = $request->withHeader('Accept', 'text/html');
6868
$this->assertSame(
69-
Response::STATUS_CODE_406,
69+
StatusCodeInterface::STATUS_NOT_ACCEPTABLE,
7070
$this->subject->process($request, $this->handler)->getStatusCode()
7171
);
7272
}
@@ -80,7 +80,7 @@ public function testWrongContentType(): void
8080
$request = $request->withHeader('Accept', 'application/hal+json');
8181
$request = $request->withHeader('Content-Type', 'text/html');
8282
$this->assertSame(
83-
Response::STATUS_CODE_415,
83+
StatusCodeInterface::STATUS_UNSUPPORTED_MEDIA_TYPE,
8484
$this->subject->process($request, $this->handler)->getStatusCode()
8585
);
8686
}
@@ -94,7 +94,7 @@ public function testCannotResolveRepresentation(): void
9494
$request = $request->withHeader('Accept', 'application/json');
9595
$request = $request->withHeader('Content-Type', 'application/json');
9696
$this->assertSame(
97-
Response::STATUS_CODE_406,
97+
StatusCodeInterface::STATUS_NOT_ACCEPTABLE,
9898
$this->subject->process($request, $this->handler)->getStatusCode()
9999
);
100100
}

0 commit comments

Comments
 (0)