Skip to content

Commit 9845152

Browse files
Merge pull request #19083 from MauricioFauth/response-renderer-mock-test-fail
Reset ResponseRenderer::$instance after test in ApplicationHandlerTest
2 parents cf6f9c0 + 52b39e0 commit 9845152

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

tests/unit/Http/Handler/ApplicationHandlerTest.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use PhpMyAdmin\Http\Response;
1111
use PhpMyAdmin\Http\ServerRequest;
1212
use PhpMyAdmin\ResponseRenderer;
13-
use PHPUnit\Framework\Attributes\BackupStaticProperties;
1413
use PHPUnit\Framework\Attributes\CoversClass;
1514
use PHPUnit\Framework\TestCase;
1615
use Psr\Http\Message\ResponseInterface;
@@ -19,48 +18,51 @@
1918
#[CoversClass(ApplicationHandler::class)]
2019
final class ApplicationHandlerTest extends TestCase
2120
{
22-
#[BackupStaticProperties(true)]
2321
public function testHandleReturnsResponse(): void
2422
{
2523
$responseRendererMock = self::createMock(ResponseRenderer::class);
2624
$responseRendererMock->expects(self::never())->method('response');
27-
(new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, $responseRendererMock);
25+
$reflectionProperty = new ReflectionProperty(ResponseRenderer::class, 'instance');
26+
$reflectionProperty->setValue(null, $responseRendererMock);
2827
$request = self::createStub(ServerRequest::class);
2928
$responseStub = new Response(self::createStub(ResponseInterface::class));
3029
$appMock = self::createMock(Application::class);
3130
$appMock->expects(self::once())->method('handle')->with($request)->willReturn($responseStub);
3231
$handler = new ApplicationHandler($appMock);
3332
$response = $handler->handle($request);
3433
self::assertSame($response, $responseStub);
34+
$reflectionProperty->setValue(null, null);
3535
}
3636

37-
#[BackupStaticProperties(true)]
3837
public function testHandleThrowsExit(): void
3938
{
4039
$responseStub = new Response(self::createStub(ResponseInterface::class));
4140
$responseRendererMock = self::createMock(ResponseRenderer::class);
4241
$responseRendererMock->expects(self::once())->method('response')->willReturn($responseStub);
43-
(new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, $responseRendererMock);
42+
$reflectionProperty = new ReflectionProperty(ResponseRenderer::class, 'instance');
43+
$reflectionProperty->setValue(null, $responseRendererMock);
4444
$request = self::createStub(ServerRequest::class);
4545
$appMock = self::createMock(Application::class);
4646
$appMock->expects(self::once())->method('handle')->with($request)->willThrowException(new ExitException());
4747
$handler = new ApplicationHandler($appMock);
4848
$response = $handler->handle($request);
4949
self::assertSame($response, $responseStub);
50+
$reflectionProperty->setValue(null, null);
5051
}
5152

52-
#[BackupStaticProperties(true)]
5353
public function testHandleReturnsNull(): void
5454
{
5555
$responseStub = new Response(self::createStub(ResponseInterface::class));
5656
$responseRendererMock = self::createMock(ResponseRenderer::class);
5757
$responseRendererMock->expects(self::once())->method('response')->willReturn($responseStub);
58-
(new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, $responseRendererMock);
58+
$reflectionProperty = new ReflectionProperty(ResponseRenderer::class, 'instance');
59+
$reflectionProperty->setValue(null, $responseRendererMock);
5960
$request = self::createStub(ServerRequest::class);
6061
$appMock = self::createMock(Application::class);
6162
$appMock->expects(self::once())->method('handle')->with($request)->willReturn(null);
6263
$handler = new ApplicationHandler($appMock);
6364
$response = $handler->handle($request);
6465
self::assertSame($response, $responseStub);
66+
$reflectionProperty->setValue(null, null);
6567
}
6668
}

tests/unit/Stubs/ResponseRenderer.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use PhpMyAdmin\ConfigStorage\Relation;
1717
use PhpMyAdmin\Console;
1818
use PhpMyAdmin\DatabaseInterface;
19-
use PhpMyAdmin\Exceptions\ExitException;
2019
use PhpMyAdmin\Footer;
2120
use PhpMyAdmin\Header;
2221
use PhpMyAdmin\Http\Factory\ResponseFactory;
@@ -178,11 +177,6 @@ public function isDisabled(): bool
178177
return $this->isDisabled;
179178
}
180179

181-
public function callExit(string $message = ''): never
182-
{
183-
throw new ExitException($message);
184-
}
185-
186180
public function getResponse(): Response
187181
{
188182
return $this->response;

0 commit comments

Comments
 (0)