diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-03-25 22:21:27 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-03-25 22:21:27 +0100 |
| commit | 2ee65f177e4f7e09ad2287f14d564e7068d322fb (patch) | |
| tree | 39075e87ea7927e20e8956824cb7c49bf626b178 /tests/lib/Encryption | |
| parent | 3cf321fdfc4235a87015a9af2f59c63220016c65 (diff) | |
| download | nextcloud-server-2ee65f177e4f7e09ad2287f14d564e7068d322fb.tar.gz nextcloud-server-2ee65f177e4f7e09ad2287f14d564e7068d322fb.zip | |
Use the shorter phpunit syntax for mocked return values
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'tests/lib/Encryption')
| -rw-r--r-- | tests/lib/Encryption/Keys/StorageTest.php | 8 | ||||
| -rw-r--r-- | tests/lib/Encryption/UtilTest.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php index 31936a4176b..b333729ef87 100644 --- a/tests/lib/Encryption/Keys/StorageTest.php +++ b/tests/lib/Encryption/Keys/StorageTest.php @@ -335,7 +335,7 @@ class StorageTest extends TestCase { ->willReturn(true); $this->util->expects($this->any()) ->method('getUidAndFilename') - ->will($this->returnCallback(array($this, 'getUidAndFilenameCallback'))); + ->willReturnCallback(array($this, 'getUidAndFilenameCallback')); $this->util->expects($this->any()) ->method('isSystemWideMountPoint') ->willReturnCallback(function($path, $owner) use ($systemWideMountSource, $systemWideMountTarget) { @@ -366,7 +366,7 @@ class StorageTest extends TestCase { ->willReturn(true); $this->util->expects($this->any()) ->method('getUidAndFilename') - ->will($this->returnCallback(array($this, 'getUidAndFilenameCallback'))); + ->willReturnCallback(array($this, 'getUidAndFilenameCallback')); $this->util->expects($this->any()) ->method('isSystemWideMountPoint') ->willReturnCallback(function($path, $owner) use ($systemWideMountSource, $systemWideMountTarget) { @@ -432,7 +432,7 @@ class StorageTest extends TestCase { $this->util->expects($this->any()) ->method('getUidAndFilename') - ->will($this->returnCallback(array($this, 'getUidAndFilenameCallback'))); + ->willReturnCallback(array($this, 'getUidAndFilenameCallback')); $this->util->expects($this->any()) ->method('isSystemWideMountPoint') ->willReturn($systemWideMountPoint); @@ -460,7 +460,7 @@ class StorageTest extends TestCase { ->willReturn(false); $this->view->expects($this->any()) ->method('mkdir') - ->will($this->returnCallback(array($this, 'mkdirCallback'))); + ->willReturnCallback(array($this, 'mkdirCallback')); $this->mkdirStack = array( '/user1/files_encryption/keys/foo', diff --git a/tests/lib/Encryption/UtilTest.php b/tests/lib/Encryption/UtilTest.php index e503da109a8..2c5bd1a80f3 100644 --- a/tests/lib/Encryption/UtilTest.php +++ b/tests/lib/Encryption/UtilTest.php @@ -120,7 +120,7 @@ class UtilTest extends TestCase { $this->userManager ->expects($this->any()) ->method('userExists') - ->will($this->returnCallback(array($this, 'isExcludedCallback'))); + ->willReturnCallback(array($this, 'isExcludedCallback')); $this->assertSame($expected, $this->util->isExcluded($path) |