upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #37452 from nextcloud/fix/missing-interface-methods

Browse source 
Add missing interface methods
This commit is contained in:
Julien Veyssier 2023-03-30 14:55:51 +02:00 committed by GitHub
commit 636c2415cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/dav/lib/CalDAV/CachedSubscription.php
View file

@ -28,7 +28,6 @@ declare(strict_types=1);
namespace OCA\DAV\CalDAV;
use OCA\DAV\Exception\UnsupportedLimitOnInitialSyncException;
use Sabre\CalDAV\Backend\BackendInterface;
use Sabre\DAV\Exception\MethodNotAllowed;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\INode;
@ -38,7 +37,7 @@ use Sabre\DAV\PropPatch;
* Class CachedSubscription
*
* @package OCA\DAV\CalDAV
* @property BackendInterface|CalDavBackend $caldavBackend
* @property CalDavBackend $caldavBackend
*/
class CachedSubscription extends \Sabre\CalDAV\Calendar {
@ -112,7 +111,7 @@ class CachedSubscription extends \Sabre\CalDAV\Calendar {
return parent::getOwner();
}
public function delete() {
$this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
}

2
apps/dav/lib/CardDAV/AddressBook.php
View file

@ -38,7 +38,7 @@ use Sabre\DAV\PropPatch;
* Class AddressBook
*
* @package OCA\DAV\CardDAV
* @property BackendInterface|CardDavBackend $carddavBackend
* @property CardDavBackend $carddavBackend
*/
class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {

2
apps/provisioning_api/lib/Controller/AUserData.php
View file

@ -66,7 +66,7 @@ abstract class AUserData extends OCSController {
protected $userManager;
/** @var IConfig */
protected $config;
/** @var IGroupManager|Manager */ // FIXME Requires a method that is not on the interface
/** @var Manager */
protected $groupManager;
/** @var IUserSession */
protected $userSession;

2
core/Controller/LoginController.php
View file

@ -66,7 +66,7 @@ class LoginController extends Controller {
private IUserManager $userManager;
private IConfig $config;
private ISession $session;
/** @var IUserSession|Session */
/** @var Session */
private $userSession;
private IURLGenerator $urlGenerator;
private Defaults $defaults;

2
lib/private/Collaboration/Resources/Collection.php
View file

@ -37,7 +37,7 @@ use OCP\IDBConnection;
use OCP\IUser;
class Collection implements ICollection {
/** @var IManager|Manager */
/** @var Manager */
protected $manager;
/** @var IDBConnection */

2
lib/private/NavigationManager.php
View file

@ -61,7 +61,7 @@ class NavigationManager implements INavigationManager {
private $l10nFac;
/** @var IUserSession */
private $userSession;
/** @var IGroupManager|Manager */
/** @var Manager */
private $groupManager;
/** @var IConfig */
private $config;

2
lib/private/Repair/NC16/ClearCollectionsAccessCache.php
View file

@ -35,7 +35,7 @@ class ClearCollectionsAccessCache implements IRepairStep {
/** @var IConfig */
private $config;
/** @var IManager|Manager */
/** @var Manager */
private $manager;
public function __construct(IConfig $config, IManager $manager) {

3
lib/private/Updater.php
View file

@ -40,7 +40,6 @@ declare(strict_types=1);
*/
namespace OC;
use OCP\App\IAppManager;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\HintException;
@ -274,7 +273,7 @@ class Updater extends BasicEmitter {
// Update the appfetchers version so it downloads the correct list from the appstore
\OC::$server->getAppFetcher()->setVersion($currentVersion);
/** @var IAppManager|AppManager $appManager */
/** @var AppManager $appManager */
$appManager = \OC::$server->getAppManager();
// upgrade appstore apps