From e2e1eee97797f34f89b96ccffccbafaefdd17707 Mon Sep 17 00:00:00 2001
From: Torben Hansen <derhansen@gmail.com>
Date: Sat, 29 Oct 2022 13:56:41 +0200
Subject: [PATCH] [TASK] Replace prophecy in EXT:form ProcessingRuleTest
Resolves: #98902
Releases: main
Change-Id: Icf72d1124c6abec85940d8ff511f6bdff62e9e06
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/76328
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Nikita Hovratov <nikita.h@live.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Nikita Hovratov <nikita.h@live.de>
---
.../Tests/Unit/Mvc/ProcessingRuleTest.php | 33 +++++++++----------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php b/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php
index 7053ef2556e9..34f4624d5cfd 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Form\Tests\Unit\Mvc;
-use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Extbase\Property\PropertyMapper;
use TYPO3\CMS\Extbase\Validation\Validator\AbstractValidator;
use TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator;
@@ -32,8 +31,6 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
*/
class ProcessingRuleTest extends UnitTestCase
{
- use ProphecyTrait;
-
/**
* @test
*/
@@ -41,9 +38,9 @@ class ProcessingRuleTest extends UnitTestCase
{
$conjunctionValidator = new ConjunctionValidator();
$conjunctionValidator->setOptions([]);
- $validatorResolver = $this->prophesize(ValidatorResolver::class);
- $validatorResolver->createValidator(ConjunctionValidator::class)->willReturn($conjunctionValidator);
- $subject = new ProcessingRule($this->prophesize(PropertyMapper::class)->reveal(), $validatorResolver->reveal());
+ $validatorResolver = $this->createMock(ValidatorResolver::class);
+ $validatorResolver->method('createValidator')->with(ConjunctionValidator::class)->willReturn($conjunctionValidator);
+ $subject = new ProcessingRule($this->createMock(PropertyMapper::class), $validatorResolver);
$testValidator = new TestValidator();
$testValidator->setOptions([]);
$subject->addValidator($testValidator);
@@ -59,9 +56,9 @@ class ProcessingRuleTest extends UnitTestCase
{
$conjunctionValidator = new ConjunctionValidator();
$conjunctionValidator->setOptions([]);
- $validatorResolver = $this->prophesize(ValidatorResolver::class);
- $validatorResolver->createValidator(ConjunctionValidator::class)->willReturn($conjunctionValidator);
- $subject = new ProcessingRule($this->prophesize(PropertyMapper::class)->reveal(), $validatorResolver->reveal());
+ $validatorResolver = $this->createMock(ValidatorResolver::class);
+ $validatorResolver->method('createValidator')->with(ConjunctionValidator::class)->willReturn($conjunctionValidator);
+ $subject = new ProcessingRule($this->createMock(PropertyMapper::class), $validatorResolver);
$subject->addValidator(new TestValidator());
$subject->addValidator(new AnotherTestValidator());
$subject->addValidator(new TestValidator());
@@ -76,9 +73,9 @@ class ProcessingRuleTest extends UnitTestCase
{
$conjunctionValidator = new ConjunctionValidator();
$conjunctionValidator->setOptions([]);
- $validatorResolver = $this->prophesize(ValidatorResolver::class);
- $validatorResolver->createValidator(ConjunctionValidator::class)->willReturn($conjunctionValidator);
- $subject = new ProcessingRule($this->prophesize(PropertyMapper::class)->reveal(), $validatorResolver->reveal());
+ $validatorResolver = $this->createMock(ValidatorResolver::class);
+ $validatorResolver->method('createValidator')->with(ConjunctionValidator::class)->willReturn($conjunctionValidator);
+ $subject = new ProcessingRule($this->createMock(PropertyMapper::class), $validatorResolver);
$subject->addValidator(new TestValidator());
$subject->addValidator(new AnotherTestValidator());
$subject->addValidator(new TestValidator());
@@ -97,9 +94,9 @@ class ProcessingRuleTest extends UnitTestCase
{
$conjunctionValidator = new ConjunctionValidator();
$conjunctionValidator->setOptions([]);
- $validatorResolver = $this->prophesize(ValidatorResolver::class);
- $validatorResolver->createValidator(ConjunctionValidator::class)->willReturn($conjunctionValidator);
- $subject = new ProcessingRule($this->prophesize(PropertyMapper::class)->reveal(), $validatorResolver->reveal());
+ $validatorResolver = $this->createMock(ValidatorResolver::class);
+ $validatorResolver->method('createValidator')->with(ConjunctionValidator::class)->willReturn($conjunctionValidator);
+ $subject = new ProcessingRule($this->createMock(PropertyMapper::class), $validatorResolver);
$input = 'someValue';
self::assertSame($input, $subject->process($input));
}
@@ -111,9 +108,9 @@ class ProcessingRuleTest extends UnitTestCase
{
$conjunctionValidator = new ConjunctionValidator();
$conjunctionValidator->setOptions([]);
- $validatorResolver = $this->prophesize(ValidatorResolver::class);
- $validatorResolver->createValidator(ConjunctionValidator::class)->willReturn($conjunctionValidator);
- $subject = new ProcessingRule($this->prophesize(PropertyMapper::class)->reveal(), $validatorResolver->reveal());
+ $validatorResolver = $this->createMock(ValidatorResolver::class);
+ $validatorResolver->method('createValidator')->with(ConjunctionValidator::class)->willReturn($conjunctionValidator);
+ $subject = new ProcessingRule($this->createMock(PropertyMapper::class), $validatorResolver);
$subject->addValidator(new TestValidator());
$input = 'addError';
$subject->process($input);
--
GitLab