Fix test traits for phpunit 9

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2020-10-29 14:34:47 +01:00
parent b611bc3115
commit 9317e0f0f0
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 4 additions and 4 deletions

View File

@ -39,7 +39,7 @@ trait ClientServiceTrait {
* @param string $originalClassName * @param string $originalClassName
* @return \PHPUnit\Framework\MockObject\MockObject * @return \PHPUnit\Framework\MockObject\MockObject
*/ */
abstract protected function createMock($originalClassName); abstract protected function createMock(string $originalClassName);
/** /**
* Returns a matcher that matches when the method is executed * Returns a matcher that matches when the method is executed
@ -49,7 +49,7 @@ trait ClientServiceTrait {
* *
* @since Method available since Release 3.0.0 * @since Method available since Release 3.0.0
*/ */
abstract public function any(); abstract static public function any();
protected function setUpClientServiceTrait() { protected function setUpClientServiceTrait() {
$this->clientService = $this->createMock(IClientService::class); $this->clientService = $this->createMock(IClientService::class);

View File

@ -24,8 +24,8 @@ trait EncryptionTrait {
abstract protected function registerStorageWrapper($name, $wrapper); abstract protected function registerStorageWrapper($name, $wrapper);
// from phpunit // from phpunit
abstract protected function markTestSkipped(string $message = ''): void; abstract static protected function markTestSkipped(string $message = ''): void;
abstract protected function assertTrue($condition, string $message = ''): void; abstract static protected function assertTrue($condition, string $message = ''): void;
private $encryptionWasEnabled; private $encryptionWasEnabled;