diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-11-28 08:36:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-28 08:36:10 +0100 |
| commit | 669302e570024c83140ff5c4f4b1489c5a1c66ed (patch) | |
| tree | 010182798f5c83193554031753e063a8a0b35ca1 /tests/lib/Share | |
| parent | 125be68311a319f2b839e5aa4ea29cd642cd1e00 (diff) | |
| parent | e3e782b63df4f1d65c86cb3b204b4bdecf93a6cd (diff) | |
| download | nextcloud-server-669302e570024c83140ff5c4f4b1489c5a1c66ed.tar.gz nextcloud-server-669302e570024c83140ff5c4f4b1489c5a1c66ed.zip | |
Merge pull request #18064 from nextcloud/feature/php74
Add php7.4 support
Diffstat (limited to 'tests/lib/Share')
| -rw-r--r-- | tests/lib/Share/HelperTest.php | 3 | ||||
| -rw-r--r-- | tests/lib/Share/ShareTest.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/lib/Share/HelperTest.php b/tests/lib/Share/HelperTest.php index 02118bf0e2e..dc2d26509e3 100644 --- a/tests/lib/Share/HelperTest.php +++ b/tests/lib/Share/HelperTest.php @@ -122,9 +122,10 @@ class HelperTest extends \Test\TestCase { * @dataProvider dataTestSplitUserRemoteError * * @param string $id - * @expectedException \OC\HintException */ public function testSplitUserRemoteError($id) { + $this->expectException(\OC\HintException::class); + \OC\Share\Helper::splitUserRemote($id); } diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php index 7db58d744d5..af05d0c4bdd 100644 --- a/tests/lib/Share/ShareTest.php +++ b/tests/lib/Share/ShareTest.php @@ -67,7 +67,7 @@ class ShareTest extends \Test\TestCase { /** @var IUserManager */ protected $userManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->groupManager = \OC::$server->getGroupManager(); @@ -113,7 +113,7 @@ class ShareTest extends \Test\TestCase { $this->dateInFuture = date($dateFormat, $now + 20 * 60); } - protected function tearDown() { + protected function tearDown(): void { $query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `item_type` = ?'); $query->execute(array('test')); \OC::$server->getConfig()->setAppValue('core', 'shareapi_allow_resharing', $this->resharing); |