From 8d483c55c593ce90bdaabe93b7870bf90f593090 Mon Sep 17 00:00:00 2001
From: Torben Hansen <derhansen@gmail.com>
Date: Sat, 19 Nov 2022 19:46:32 +0100
Subject: [PATCH] [TASK] Remove prophecy in EXT:core SiteTest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Besides the prophecy removal, also 3 assertions
are changed to assert concrete class instances
instead of generic interface. Thus avoid having
superflous tests and transform them into a good
test assertion.
Resolves: #98785
Releases: main
Change-Id: I7d0db4907106f7ef09bf8a5590afce4f57add644
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/76713
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Nikita Hovratov <nikita.h@live.de>
Reviewed-by: Nikita Hovratov <nikita.h@live.de>
---
.../sysext/core/Tests/Unit/Site/Entity/SiteTest.php | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/typo3/sysext/core/Tests/Unit/Site/Entity/SiteTest.php b/typo3/sysext/core/Tests/Unit/Site/Entity/SiteTest.php
index 9379ae531f54..b8cccdf95bca 100644
--- a/typo3/sysext/core/Tests/Unit/Site/Entity/SiteTest.php
+++ b/typo3/sysext/core/Tests/Unit/Site/Entity/SiteTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Tests\Unit\Site\Entity;
-use Prophecy\PhpUnit\ProphecyTrait;
use Psr\Http\Message\ResponseFactoryInterface;
use Symfony\Component\DependencyInjection\Container;
use TYPO3\CMS\Core\Cache\CacheManager;
@@ -42,8 +41,6 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
class SiteTest extends UnitTestCase
{
- use ProphecyTrait;
-
public function tearDown(): void
{
parent::tearDown();
@@ -170,8 +167,7 @@ class SiteTest extends UnitTestCase
],
]);
- $fluidProphecy = $this->prophesize(FluidPageErrorHandler::class);
- GeneralUtility::addInstance(FluidPageErrorHandler::class, $fluidProphecy->reveal());
+ GeneralUtility::addInstance(FluidPageErrorHandler::class, $this->createMock(FluidPageErrorHandler::class));
$app = new class () extends Application {
// This is ugly but php-cs-fixer insists.
@@ -212,9 +208,9 @@ class SiteTest extends UnitTestCase
$container->set(CacheManager::class, $cacheManager);
GeneralUtility::setContainer($container);
- self::assertInstanceOf(PageErrorHandlerInterface::class, $subject->getErrorHandler(123));
- self::assertInstanceOf(PageErrorHandlerInterface::class, $subject->getErrorHandler(124));
- self::assertInstanceOf(PageErrorHandlerInterface::class, $subject->getErrorHandler(125));
+ self::assertInstanceOf(FluidPageErrorHandler::class, $subject->getErrorHandler(123));
+ self::assertInstanceOf(PageContentErrorHandler::class, $subject->getErrorHandler(124));
+ self::assertInstanceOf(PageContentErrorHandler::class, $subject->getErrorHandler(125));
}
/**
--
GitLab