Browse Source

Address minor comments

Signed-off-by: Julius Härtl <jus@bitgrid.net>
tags/v21.0.0beta1
Julius Härtl 3 years ago
parent
commit
c4ea37b8a1
No account linked to committer's email address

+ 1
- 1
apps/files/lib/Controller/ApiController.php View File

@@ -222,7 +222,7 @@ class ApiController extends Controller {
IShare::TYPE_REMOTE,
IShare::TYPE_EMAIL,
IShare::TYPE_ROOM,
IShare::TYPE_DECK
IShare::TYPE_DECK,
];
foreach ($requestedShareTypes as $requestedShareType) {
// one of each type is enough to find out about the types

+ 2
- 2
apps/files_sharing/lib/Controller/DeletedShareAPIController.php View File

@@ -220,7 +220,7 @@ class DeletedShareAPIController extends OCSController {
throw new QueryException();
}

return $this->serverContainer->query('\OCA\Talk\Share\Helper\DeletedShareAPIController');
return $this->serverContainer->get('\OCA\Talk\Share\Helper\DeletedShareAPIController');
}

/**
@@ -237,6 +237,6 @@ class DeletedShareAPIController extends OCSController {
throw new QueryException();
}

return $this->serverContainer->query('\OCA\Deck\Sharing\ShareAPIHelper');
return $this->serverContainer->get('\OCA\Deck\Sharing\ShareAPIHelper');
}
}

+ 2
- 2
apps/files_sharing/lib/Controller/ShareAPIController.php View File

@@ -1558,7 +1558,7 @@ class ShareAPIController extends OCSController {
throw new QueryException();
}

return $this->serverContainer->query('\OCA\Talk\Share\Helper\ShareAPIController');
return $this->serverContainer->get('\OCA\Talk\Share\Helper\ShareAPIController');
}

/**
@@ -1575,7 +1575,7 @@ class ShareAPIController extends OCSController {
throw new QueryException();
}

return $this->serverContainer->query('\OCA\Deck\Sharing\ShareAPIHelper');
return $this->serverContainer->get('\OCA\Deck\Sharing\ShareAPIHelper');
}

/**

+ 4
- 4
apps/files_sharing/tests/Controller/ShareAPIControllerTest.php View File

@@ -1558,7 +1558,7 @@ class ShareAPIControllerTest extends TestCase {
->with($share, $this->currentUser)
->willReturn($canAccessShareByHelper);

$this->serverContainer->method('query')
$this->serverContainer->method('get')
->with('\OCA\Talk\Share\Helper\ShareAPIController')
->willReturn($helper);
}
@@ -2222,7 +2222,7 @@ class ShareAPIControllerTest extends TestCase {
}
);

$this->serverContainer->method('query')
$this->serverContainer->method('get')
->with('\OCA\Talk\Share\Helper\ShareAPIController')
->willReturn($helper);

@@ -2340,7 +2340,7 @@ class ShareAPIControllerTest extends TestCase {
}
);

$this->serverContainer->method('query')
$this->serverContainer->method('get')
->with('\OCA\Talk\Share\Helper\ShareAPIController')
->willReturn($helper);

@@ -4404,7 +4404,7 @@ class ShareAPIControllerTest extends TestCase {
->with($share)
->willReturn($formatShareByHelper);

$this->serverContainer->method('query')
$this->serverContainer->method('get')
->with('\OCA\Talk\Share\Helper\ShareAPIController')
->willReturn($helper);
}

+ 2
- 1
lib/private/Share/Constants.php View File

@@ -71,9 +71,10 @@ class Constants {
public const SHARE_TYPE_ROOM = 10;
// const SHARE_TYPE_USERROOM = 11; // Internal type used by RoomShareProvider
/**
* @deprecated 21.0.0 - use IShare::TYPE_ROOM instead
* @deprecated 21.0.0 - use IShare::TYPE_DECK instead
*/
public const SHARE_TYPE_DECK = 12;
// const SHARE_TYPE_DECK_USER = 13; // Internal type used by DeckShareProvider

public const FORMAT_NONE = -1;
public const FORMAT_STATUSES = -2;

+ 2
- 1
lib/public/Share/IShare.php View File

@@ -111,7 +111,8 @@ interface IShare {
public const TYPE_DECK = 12;

/**
* @internal 21.00
* @internal
* @since 21.0.0
*/
public const TYPE_DECK_USER = 13;


Loading…
Cancel
Save