@@ -98,7 +98,7 @@ |
||
| 98 | 98 | /** |
| 99 | 99 | * get the stored metadata of a file or folder |
| 100 | 100 | * |
| 101 | - * @param string|int $file |
|
| 101 | + * @param string $file |
|
| 102 | 102 | * @return array|false |
| 103 | 103 | */ |
| 104 | 104 | public function get($file) { |
@@ -45,7 +45,6 @@ discard block |
||
| 45 | 45 | /** |
| 46 | 46 | * @param string $appName |
| 47 | 47 | * @param IRequest $request |
| 48 | - * @param bool $incomingShareEnabled |
|
| 49 | 48 | * @param \OCA\Files_Sharing\External\Manager $externalManager |
| 50 | 49 | * @param IClientService $clientService |
| 51 | 50 | */ |
@@ -84,7 +83,7 @@ discard block |
||
| 84 | 83 | * @NoAdminRequired |
| 85 | 84 | * @NoOutgoingFederatedSharingRequired |
| 86 | 85 | * |
| 87 | - * @param $id |
|
| 86 | + * @param integer $id |
|
| 88 | 87 | * @return JSONResponse |
| 89 | 88 | */ |
| 90 | 89 | public function destroy($id) { |
@@ -124,7 +124,7 @@ |
||
| 124 | 124 | * @UseSession |
| 125 | 125 | * |
| 126 | 126 | * Authenticates against password-protected shares |
| 127 | - * @param $token |
|
| 127 | + * @param string $token |
|
| 128 | 128 | * @param string $password |
| 129 | 129 | * @return RedirectResponse|TemplateResponse |
| 130 | 130 | */ |
@@ -311,6 +311,9 @@ |
||
| 311 | 311 | return $result; |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | + /** |
|
| 315 | + * @param string $mountPoint |
|
| 316 | + */ |
|
| 314 | 317 | public function removeShare($mountPoint) { |
| 315 | 318 | $mountPoint = $this->stripPath($mountPoint); |
| 316 | 319 | $hash = md5($mountPoint); |
@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use OCP\App\IAppManager; |
| 28 | 28 | use OCP\AppFramework\Http\NotFoundResponse; |
| 29 | 29 | use OCP\AppFramework\Middleware; |
| 30 | -use OCP\AppFramework\Http\TemplateResponse; |
|
| 31 | 30 | use OCP\Files\NotFoundException; |
| 32 | 31 | use OCP\IConfig; |
| 33 | 32 | use OCP\AppFramework\Utility\IControllerMethodReflector; |
@@ -53,6 +53,11 @@ |
||
| 53 | 53 | */ |
| 54 | 54 | private $user; |
| 55 | 55 | |
| 56 | + /** |
|
| 57 | + * @param string $storage |
|
| 58 | + * @param string $mountpoint |
|
| 59 | + * @param \OCP\Files\Storage\IStorageFactory $loader |
|
| 60 | + */ |
|
| 56 | 61 | public function __construct($storage, $mountpoint, $arguments = null, $loader = null) { |
| 57 | 62 | // first update the mount point before creating the parent |
| 58 | 63 | $this->ownerPropagator = $arguments['propagator']; |
@@ -486,6 +486,9 @@ |
||
| 486 | 486 | return $this->share['file_target']; |
| 487 | 487 | } |
| 488 | 488 | |
| 489 | + /** |
|
| 490 | + * @param string $path |
|
| 491 | + */ |
|
| 489 | 492 | public function setMountPoint($path) { |
| 490 | 493 | $this->share['file_target'] = $path; |
| 491 | 494 | } |
@@ -32,8 +32,6 @@ |
||
| 32 | 32 | |
| 33 | 33 | use OC\Files\Filesystem; |
| 34 | 34 | use OCA\Files_Sharing\ISharedStorage; |
| 35 | -use OCA\Files_Sharing\Propagator; |
|
| 36 | -use OCA\Files_Sharing\SharedMount; |
|
| 37 | 35 | use OCP\Lock\ILockingProvider; |
| 38 | 36 | |
| 39 | 37 | /** |
@@ -81,6 +81,10 @@ discard block |
||
| 81 | 81 | ); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | + /** |
|
| 85 | + * @param string $uid |
|
| 86 | + * @param string $displayName |
|
| 87 | + */ |
|
| 84 | 88 | protected function getUserMock($uid, $displayName) { |
| 85 | 89 | $user = $this->getMockBuilder('OCP\IUser') |
| 86 | 90 | ->disableOriginalConstructor() |
@@ -97,6 +101,9 @@ discard block |
||
| 97 | 101 | return $user; |
| 98 | 102 | } |
| 99 | 103 | |
| 104 | + /** |
|
| 105 | + * @param string $gid |
|
| 106 | + */ |
|
| 100 | 107 | protected function getGroupMock($gid) { |
| 101 | 108 | $group = $this->getMockBuilder('OCP\IGroup') |
| 102 | 109 | ->disableOriginalConstructor() |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | |
| 25 | 25 | use OC\Files\Filesystem; |
| 26 | 26 | use OC\Files\View; |
| 27 | -use OC\Lock\MemcacheLockingProvider; |
|
| 28 | 27 | use OCP\Lock\ILockingProvider; |
| 29 | 28 | |
| 30 | 29 | class Locking extends TestCase { |