diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon index 5b01a013..f91290b6 100644 --- a/Build/phpstan/phpstan-baseline.neon +++ b/Build/phpstan/phpstan-baseline.neon @@ -1,10 +1,5 @@ parameters: ignoreErrors: - - - message: "#^Call to an undefined method PHPUnit\\\\Framework\\\\MockObject\\\\MockBuilder\\\\:\\:setMethods\\(\\)\\.$#" - count: 1 - path: ../../Classes/Core/BaseTestCase.php - - message: "#^Instantiated class PHPUnit\\\\Framework\\\\RiskyTestError not found\\.$#" count: 3 diff --git a/Classes/Core/BaseTestCase.php b/Classes/Core/BaseTestCase.php index 1573b4a7..21587013 100644 --- a/Classes/Core/BaseTestCase.php +++ b/Classes/Core/BaseTestCase.php @@ -124,10 +124,15 @@ protected function getAccessibleMock( } $mockBuilder = $this->getMockBuilder($this->buildAccessibleProxy($originalClassName)) - ->setMethods($methods) ->setConstructorArgs($arguments) ->setMockClassName($mockClassName); + if ($methods === null) { + $mockBuilder->onlyMethods([]); + } elseif (!empty($methods)) { + $mockBuilder->onlyMethods($methods); + } + if (!$callOriginalConstructor) { $mockBuilder->disableOriginalConstructor(); }