diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2020-10-29 14:34:47 +0100 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2020-12-07 15:44:03 +0100 |
commit | 9317e0f0f04b9bdef035c7212d5d587c84447309 (patch) | |
tree | d830ebf38f90fa4fe249aeaf13c9e93e493d9933 | |
parent | b611bc31156a033a84e95b17f0310862a3c0f94f (diff) | |
download | nextcloud-server-9317e0f0f04b9bdef035c7212d5d587c84447309.tar.gz nextcloud-server-9317e0f0f04b9bdef035c7212d5d587c84447309.zip |
Fix test traits for phpunit 9
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r-- | tests/lib/Traits/ClientServiceTrait.php | 4 | ||||
-rw-r--r-- | tests/lib/Traits/EncryptionTrait.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib/Traits/ClientServiceTrait.php b/tests/lib/Traits/ClientServiceTrait.php index e9e9787d734..60313d5fa7a 100644 --- a/tests/lib/Traits/ClientServiceTrait.php +++ b/tests/lib/Traits/ClientServiceTrait.php @@ -39,7 +39,7 @@ trait ClientServiceTrait { * @param string $originalClassName * @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 @@ -49,7 +49,7 @@ trait ClientServiceTrait { * * @since Method available since Release 3.0.0 */ - abstract public function any(); + abstract static public function any(); protected function setUpClientServiceTrait() { $this->clientService = $this->createMock(IClientService::class); diff --git a/tests/lib/Traits/EncryptionTrait.php b/tests/lib/Traits/EncryptionTrait.php index 38ba18fdfbb..f0bbb138d44 100644 --- a/tests/lib/Traits/EncryptionTrait.php +++ b/tests/lib/Traits/EncryptionTrait.php @@ -24,8 +24,8 @@ trait EncryptionTrait { abstract protected function registerStorageWrapper($name, $wrapper); // from phpunit - abstract protected function markTestSkipped(string $message = ''): void; - abstract protected function assertTrue($condition, string $message = ''): void; + abstract static protected function markTestSkipped(string $message = ''): void; + abstract static protected function assertTrue($condition, string $message = ''): void; private $encryptionWasEnabled; |