diff --git a/Tests/Unit/Core/Model/AbstractFinisherTest.php b/Tests/Unit/Core/Model/AbstractFinisherTest.php index 41a74a4..b026278 100644 --- a/Tests/Unit/Core/Model/AbstractFinisherTest.php +++ b/Tests/Unit/Core/Model/AbstractFinisherTest.php @@ -206,7 +206,7 @@ protected function getAbstractFinisher() */ protected function getFinisherContext() { - $this->formRuntime = $this->getAccessibleMock(FormRuntime::class, ['dummy'], [], '', false); + $this->formRuntime = $this->getAccessibleMock(FormRuntime::class, [], [], '', false); return new FinisherContext($this->formRuntime); } } diff --git a/Tests/Unit/Core/Model/AbstractFormElementTest.php b/Tests/Unit/Core/Model/AbstractFormElementTest.php index cbb35ac..a489caf 100644 --- a/Tests/Unit/Core/Model/AbstractFormElementTest.php +++ b/Tests/Unit/Core/Model/AbstractFormElementTest.php @@ -182,7 +182,7 @@ public function isRequiredReturnsTrueIfNotEmptyValidatorIsAdded() */ protected function getFormElement(array $constructorArguments) { - return $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->setConstructorArgs($constructorArguments)->getMock(); + return $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->setConstructorArgs($constructorArguments)->getMock(); } /** @@ -193,7 +193,7 @@ protected function getFormElement(array $constructorArguments) */ protected function getFormDefinitionWithProcessingRule($formElementIdentifier) { - $mockProcessingRule = $this->getAccessibleMock(ProcessingRule::class, ['dummy']); + $mockProcessingRule = $this->getAccessibleMock(ProcessingRule::class, []); $mockProcessingRule->_set('validator', new ConjunctionValidator()); $formDefinition = $this->getMockBuilder(FormDefinition::class)->onlyMethods(['getProcessingRule'])->setConstructorArgs(['foo'])->getMock(); diff --git a/Tests/Unit/Core/Model/PageTest.php b/Tests/Unit/Core/Model/PageTest.php index e26a058..6f0892c 100644 --- a/Tests/Unit/Core/Model/PageTest.php +++ b/Tests/Unit/Core/Model/PageTest.php @@ -104,9 +104,9 @@ public function getElementsRecursivelyReturnsFirstLevelFormElements() { $page = new Page('foo'); /** @var AbstractFormElement|MockObject $element1 */ - $element1 = $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element1 = $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); /** @var AbstractFormElement|MockObject $element2 */ - $element2 = $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element2 = $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); $page->addElement($element1); $page->addElement($element2); Assert::assertSame([$element1, $element2], $page->getElementsRecursively()); @@ -118,17 +118,17 @@ public function getElementsRecursivelyReturnsRecursiveFormElementsInCorrectOrder $page = new Page('foo'); /** @var AbstractFormElement|MockObject $element1 */ - $element1 = $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element1 = $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); /** @var Section|MockObject $element2 */ - $element2 = $this->getMockBuilder(Section::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element2 = $this->getMockBuilder(Section::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); /** @var AbstractFormElement|MockObject $element21 */ - $element21 = $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element21 = $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); /** @var AbstractFormElement|MockObject $element22 */ - $element22 = $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element22 = $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); $element2->addElement($element21); $element2->addElement($element22); /** @var AbstractFormElement|MockObject $element3 */ - $element3 = $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element3 = $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); $page->addElement($element1); $page->addElement($element2); @@ -142,7 +142,7 @@ public function aFormElementCanOnlyBeAttachedToASinglePage() $this->expectException(FormDefinitionConsistencyException::class); /** @var AbstractFormElement|MockObject $element */ - $element = $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element = $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); $page1 = new Page('bar1'); $page2 = new Page('bar2'); @@ -156,7 +156,7 @@ public function addElementAddsElementAndSetsBackReferenceToPage() { $page = new Page('bar'); /** @var AbstractFormElement|MockObject $element */ - $element = $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element = $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); $page->addElement($element); Assert::assertSame([$element], $page->getElements()); Assert::assertSame($page, $element->getParentRenderable()); @@ -306,7 +306,7 @@ public function removeElementThrowsExceptionIfElementIsNotOnCurrentPage() $formDefinition = $this->getDummyFormDefinition(); $page1 = $formDefinition->createPage('myPage1'); /** @var AbstractFormElement|MockObject $element1 */ - $element1 = $this->getMockBuilder(AbstractFormElement::class)->addMethods(['dummy'])->disableOriginalConstructor()->getMock(); + $element1 = $this->getMockBuilder(AbstractFormElement::class)->onlyMethods([])->disableOriginalConstructor()->getMock(); $page1->removeElement($element1); } @@ -316,7 +316,7 @@ public function validatorKeyCorrectlyAddsValidator() { $formDefinition = $this->getDummyFormDefinition(); - $mockProcessingRule = $this->getAccessibleMock(ProcessingRule::class, ['dummy']); + $mockProcessingRule = $this->getAccessibleMock(ProcessingRule::class, []); /** @noinspection PhpUndefinedMethodInspection */ $mockProcessingRule->_set('validator', new ConjunctionValidator()); $formDefinition->expects($this->any())->method('getProcessingRule')->with('asdf')->willReturn($mockProcessingRule); diff --git a/Tests/Unit/Core/Model/ProcessingRuleTest.php b/Tests/Unit/Core/Model/ProcessingRuleTest.php index fb7c6e7..f4518c0 100644 --- a/Tests/Unit/Core/Model/ProcessingRuleTest.php +++ b/Tests/Unit/Core/Model/ProcessingRuleTest.php @@ -73,10 +73,10 @@ public function getValidatorsReturnsAnEmptyCollectionByDefault() public function getValidatorsReturnsPreviouslyAddedValidators() { /** @var ValidatorInterface $mockValidator1 */ - $mockValidator1 = $this->createMock(ValidatorInterface::class); + $mockValidator1 = $this->createStub(ValidatorInterface::class); $this->processingRule->addValidator($mockValidator1); /** @var ValidatorInterface $mockValidator2 */ - $mockValidator2 = $this->createMock(ValidatorInterface::class); + $mockValidator2 = $this->createStub(ValidatorInterface::class); $this->processingRule->addValidator($mockValidator2); $validators = $this->processingRule->getValidators(); diff --git a/Tests/Unit/Core/Renderer/FormRuntimeTest.php b/Tests/Unit/Core/Renderer/FormRuntimeTest.php index 5a5f6f8..b7b6649 100644 --- a/Tests/Unit/Core/Renderer/FormRuntimeTest.php +++ b/Tests/Unit/Core/Renderer/FormRuntimeTest.php @@ -45,7 +45,7 @@ public function valuesSetInConstructorCanBeReadAgain() $mockActionRequest->expects(self::once())->method('createSubRequest')->willReturn($mockFormSubRequest); $actionResponse = new ActionResponse(); - $formRuntime = $this->getAccessibleMock(FormRuntime::class, ['dummy'], [$formDefinition, $mockActionRequest, $actionResponse]); + $formRuntime = $this->getAccessibleMock(FormRuntime::class, [], [$formDefinition, $mockActionRequest, $actionResponse]); Assert::assertSame($mockActionRequest, $formRuntime->getRequest()->getParentRequest()); Assert::assertInstanceOf(ActionResponse::class, $formRuntime->getResponse()); @@ -204,6 +204,6 @@ protected function createFormRuntime(FormDefinition $formDefinition) $mockActionRequest = $this->getMockBuilder(ActionRequest::class)->disableOriginalConstructor()->getMock(); $actionResponse = new ActionResponse(); - return $this->getAccessibleMock(FormRuntime::class, ['dummy'], [$formDefinition, $mockActionRequest, $actionResponse]); + return $this->getAccessibleMock(FormRuntime::class, [], [$formDefinition, $mockActionRequest, $actionResponse]); } }