Skip to content

Commit 9b1af0f

Browse files
rullzerrullzer
committed
Move the Share20OCS code over to use the OCS\DataResponse
1 parent aae24c0 commit 9b1af0f

3 files changed

Lines changed: 58 additions & 58 deletions

File tree

‎apps/files_sharing/lib/API/Share20OCS.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
namespace OCA\Files_Sharing\API;
2525

26-
use OCP\AppFramework\Http\DataResponse;
26+
use OCP\AppFramework\OCS\DataResponse;
2727
use OCP\AppFramework\OCS\OCSBadRequestException;
2828
use OCP\AppFramework\OCS\OCSException;
2929
use OCP\AppFramework\OCS\OCSForbiddenException;
@@ -203,7 +203,7 @@ public function getShare($id) {
203203
if ($this->canAccessShare($share)) {
204204
try {
205205
$share = $this->formatShare($share);
206-
return new DataResponse(['data' => [$share]]);
206+
return new DataResponse([$share]);
207207
} catch (NotFoundException $e) {
208208
//Fall trough
209209
}
@@ -339,7 +339,7 @@ public function createShare() {
339339
*/
340340
$existingShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_LINK, $path, false, 1, 0);
341341
if (!empty($existingShares)) {
342-
return new DataResponse(['data' => $this->formatShare($existingShares[0])]);
342+
return new DataResponse($this->formatShare($existingShares[0]));
343343
}
344344

345345
$publicUpload = $this->request->getParam('publicUpload', null);
@@ -408,7 +408,7 @@ public function createShare() {
408408

409409
$output = $this->formatShare($share);
410410

411-
return new DataResponse(['data' => $output]);
411+
return new DataResponse($output);
412412
}
413413

414414
/**
@@ -432,7 +432,7 @@ private function getSharedWithMe($node = null) {
432432
}
433433
}
434434

435-
return new DataResponse(['data' => $formatted]);
435+
return new DataResponse($formatted);
436436
}
437437

438438
/**
@@ -466,7 +466,7 @@ private function getSharesInDir($folder) {
466466
}
467467
}
468468

469-
return new DataResponse(['data' => $formatted]);
469+
return new DataResponse($formatted);
470470
}
471471

472472
/**
@@ -537,7 +537,7 @@ public function getShares() {
537537
}
538538
}
539539

540-
return new DataResponse(['data' => $formatted]);
540+
return new DataResponse($formatted);
541541
}
542542

543543
/**
@@ -671,7 +671,7 @@ public function updateShare($id) {
671671
throw new OCSBadRequestException($e->getMessage());
672672
}
673673

674-
return new DataResponse(['data' => $this->formatShare($share)]);
674+
return new DataResponse($this->formatShare($share));
675675
}
676676

677677
/**

‎apps/files_sharing/tests/API/Share20OCSTest.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
*/
2424
namespace OCA\Files_Sharing\Tests\API;
2525

26-
use OCP\AppFramework\Http\DataResponse;
27-
use OCP\AppFramework\OCS\OCSNotFoundException;
26+
use OCP\AppFramework\OCS\DataResponse;
2827
use OCP\IL10N;
2928
use OCA\Files_Sharing\API\Share20OCS;
3029
use OCP\Files\NotFoundException;
@@ -485,7 +484,7 @@ public function testGetShare(\OCP\Share\IShare $share, array $result) {
485484
['group', $group],
486485
]));
487486

488-
$this->assertEquals($result, $ocs->getShare($share->getId())->getData()['data'][0]);
487+
$this->assertEquals($result, $ocs->getShare($share->getId())->getData()[0]);
489488
}
490489

491490
/**
@@ -706,6 +705,7 @@ public function testCreateShareUser() {
706705
$share = $this->newShare();
707706
$this->shareManager->method('newShare')->willReturn($share);
708707

708+
/** @var \OCA\Files_Sharing\API\Share20OCS $ocs */
709709
$ocs = $this->getMockBuilder('OCA\Files_Sharing\API\Share20OCS')
710710
->setConstructorArgs([
711711
$this->appName,
@@ -766,7 +766,7 @@ public function testCreateShareUser() {
766766
}))
767767
->will($this->returnArgument(0));
768768

769-
$expected = new DataResponse(['data' => null]);
769+
$expected = new DataResponse(null);
770770
$result = $ocs->createShare();
771771

772772
$this->assertInstanceOf(get_class($expected), $result);
@@ -879,7 +879,7 @@ public function testCreateShareGroup() {
879879
}))
880880
->will($this->returnArgument(0));
881881

882-
$expected = new DataResponse(['data' => null]);
882+
$expected = new DataResponse(null);
883883
$result = $ocs->createShare();
884884

885885
$this->assertInstanceOf(get_class($expected), $result);
@@ -1049,7 +1049,7 @@ public function testCreateShareLinkPublicUploadFolder() {
10491049
})
10501050
)->will($this->returnArgument(0));
10511051

1052-
$expected = new DataResponse(['data' => null]);
1052+
$expected = new DataResponse(null);
10531053
$result = $ocs->createShare();
10541054

10551055
$this->assertInstanceOf(get_class($expected), $result);
@@ -1093,7 +1093,7 @@ public function testCreateShareLinkPassword() {
10931093
})
10941094
)->will($this->returnArgument(0));
10951095

1096-
$expected = new DataResponse(['data' => null]);
1096+
$expected = new DataResponse(null);
10971097
$result = $ocs->createShare();
10981098

10991099
$this->assertInstanceOf(get_class($expected), $result);
@@ -1140,7 +1140,7 @@ public function testCreateShareValidExpireDate() {
11401140
})
11411141
)->will($this->returnArgument(0));
11421142

1143-
$expected = new DataResponse(['data' => null]);
1143+
$expected = new DataResponse(null);
11441144
$result = $ocs->createShare();
11451145

11461146
$this->assertInstanceOf(get_class($expected), $result);
@@ -1337,7 +1337,7 @@ public function testUpdateLinkShareClear() {
13371337
})
13381338
)->will($this->returnArgument(0));
13391339

1340-
$expected = new DataResponse(['data' => null]);
1340+
$expected = new DataResponse(null);
13411341
$result = $ocs->updateShare(42);
13421342

13431343
$this->assertInstanceOf(get_class($expected), $result);
@@ -1377,7 +1377,7 @@ public function testUpdateLinkShareSet() {
13771377
})
13781378
)->will($this->returnArgument(0));
13791379

1380-
$expected = new DataResponse(['data' => null]);
1380+
$expected = new DataResponse(null);
13811381
$result = $ocs->updateShare(42);
13821382

13831383
$this->assertInstanceOf(get_class($expected), $result);
@@ -1415,7 +1415,7 @@ public function testUpdateLinkShareEnablePublicUpload($params) {
14151415
})
14161416
)->will($this->returnArgument(0));
14171417

1418-
$expected = new DataResponse(['data' => null]);
1418+
$expected = new DataResponse(null);
14191419
$result = $ocs->updateShare(42);
14201420

14211421
$this->assertInstanceOf(get_class($expected), $result);
@@ -1562,7 +1562,7 @@ public function testUpdateLinkSharePasswordDoesNotChangeOther() {
15621562
})
15631563
)->will($this->returnArgument(0));
15641564

1565-
$expected = new DataResponse(['data' => null]);
1565+
$expected = new DataResponse(null);
15661566
$result = $ocs->updateShare(42);
15671567

15681568
$this->assertInstanceOf(get_class($expected), $result);
@@ -1605,7 +1605,7 @@ public function testUpdateLinkShareExpireDateDoesNotChangeOther() {
16051605
})
16061606
)->will($this->returnArgument(0));
16071607

1608-
$expected = new DataResponse(['data' => null]);
1608+
$expected = new DataResponse(null);
16091609
$result = $ocs->updateShare(42);
16101610

16111611
$this->assertInstanceOf(get_class($expected), $result);
@@ -1645,7 +1645,7 @@ public function testUpdateLinkSharePublicUploadDoesNotChangeOther() {
16451645
})
16461646
)->will($this->returnArgument(0));
16471647

1648-
$expected = new DataResponse(['data' => null]);
1648+
$expected = new DataResponse(null);
16491649
$result = $ocs->updateShare(42);
16501650

16511651
$this->assertInstanceOf(get_class($expected), $result);
@@ -1687,7 +1687,7 @@ public function testUpdateLinkSharePermissions() {
16871687

16881688
$this->shareManager->method('getSharedWith')->willReturn([]);
16891689

1690-
$expected = new DataResponse(['data' => null]);
1690+
$expected = new DataResponse(null);
16911691
$result = $ocs->updateShare(42);
16921692

16931693
$this->assertInstanceOf(get_class($expected), $result);
@@ -1754,7 +1754,7 @@ public function testUpdateOtherPermissions() {
17541754

17551755
$this->shareManager->method('getSharedWith')->willReturn([]);
17561756

1757-
$expected = new DataResponse(['data' => null]);
1757+
$expected = new DataResponse(null);
17581758
$result = $ocs->updateShare(42);
17591759

17601760
$this->assertInstanceOf(get_class($expected), $result);

0 commit comments

Comments
 (0)