From 2ee65f177e4f7e09ad2287f14d564e7068d322fb Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Wed, 25 Mar 2020 22:21:27 +0100 Subject: Use the shorter phpunit syntax for mocked return values Signed-off-by: Christoph Wurst --- apps/oauth2/tests/Controller/OauthApiControllerTest.php | 12 ++++++------ apps/oauth2/tests/Controller/SettingsControllerTest.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'apps/oauth2/tests') diff --git a/apps/oauth2/tests/Controller/OauthApiControllerTest.php b/apps/oauth2/tests/Controller/OauthApiControllerTest.php index 4fca0eaa90c..820c8e041ac 100644 --- a/apps/oauth2/tests/Controller/OauthApiControllerTest.php +++ b/apps/oauth2/tests/Controller/OauthApiControllerTest.php @@ -248,9 +248,9 @@ class OauthApiControllerTest extends TestCase { ->with($accessToken); $this->secureRandom->method('generate') - ->will($this->returnCallback(function ($len) { + ->willReturnCallback(function ($len) { return 'random'.$len; - })); + }); $this->tokenProvider->expects($this->once()) ->method('rotate') @@ -340,9 +340,9 @@ class OauthApiControllerTest extends TestCase { ->with($accessToken); $this->secureRandom->method('generate') - ->will($this->returnCallback(function ($len) { + ->willReturnCallback(function ($len) { return 'random'.$len; - })); + }); $this->tokenProvider->expects($this->once()) ->method('rotate') @@ -435,9 +435,9 @@ class OauthApiControllerTest extends TestCase { ->with($accessToken); $this->secureRandom->method('generate') - ->will($this->returnCallback(function ($len) { + ->willReturnCallback(function ($len) { return 'random'.$len; - })); + }); $this->tokenProvider->expects($this->once()) ->method('rotate') diff --git a/apps/oauth2/tests/Controller/SettingsControllerTest.php b/apps/oauth2/tests/Controller/SettingsControllerTest.php index 76a4fb55ae6..1a6f20fcf80 100644 --- a/apps/oauth2/tests/Controller/SettingsControllerTest.php +++ b/apps/oauth2/tests/Controller/SettingsControllerTest.php @@ -100,10 +100,10 @@ class SettingsControllerTest extends TestCase { $c->getRedirectUri() === 'https://example.com/' && $c->getSecret() === 'MySecret' && $c->getClientIdentifier() === 'MyClientIdentifier'; - }))->will($this->returnCallback(function (Client $c) { + }))->willReturnCallback(function (Client $c) { $c->setId(42); return $c; - })); + }); $result = $this->settingsController->addClient('My Client Name', 'https://example.com/'); $this->assertInstanceOf(JSONResponse::class, $result); -- cgit v1.2.3