Use the shorter phpunit syntax for mocked return values

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

2 files changed, 8 insertions, 8 deletions

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);