Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>tags/v20.0.0beta1
@@ -37,6 +37,7 @@ use OCP\AppFramework\OCSController; | |||
use OCP\IConfig; | |||
use OCP\IRequest; | |||
use OCP\IUserSession; | |||
use OCP\PreConditionNotMetException; | |||
class ConfigController extends OCSController { | |||
@@ -103,7 +104,7 @@ class ConfigController extends OCSController { | |||
* | |||
* @param string $key theme or font | |||
* @return DataResponse | |||
* @throws Exception | |||
* @throws OCSBadRequestException|PreConditionNotMetException | |||
*/ | |||
public function setConfig(string $key, $value): DataResponse { | |||
if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') { | |||
@@ -137,7 +138,7 @@ class ConfigController extends OCSController { | |||
* | |||
* @param string $key theme or font | |||
* @return DataResponse | |||
* @throws Exception | |||
* @throws OCSBadRequestException | |||
*/ | |||
public function deleteConfig(string $key): DataResponse { | |||
if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') { |
@@ -325,7 +325,7 @@ EOF; | |||
* Returns a list of addresses that are associated with a principal. | |||
* | |||
* @param string $principal | |||
* @return string? | |||
* @return string|null | |||
*/ | |||
protected function getCalendarUserTypeForPrincipal($principal):?string { | |||
$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type'; |
@@ -82,7 +82,6 @@ class AddressBookImpl implements IAddressBook { | |||
/** | |||
* @return string defining the unique uri | |||
* @since 16.0.0 | |||
* @return string | |||
*/ | |||
public function getUri(): string { | |||
return $this->addressBookInfo['uri']; |
@@ -36,6 +36,7 @@ use OCP\Files\SimpleFS\ISimpleFile; | |||
use OCP\Files\SimpleFS\ISimpleFolder; | |||
use OCP\ILogger; | |||
use Sabre\CardDAV\Card; | |||
use Sabre\VObject\Parameter; | |||
use Sabre\VObject\Property\Binary; | |||
use Sabre\VObject\Reader; | |||
@@ -276,7 +276,6 @@ class FilesPlugin extends ServerPlugin { | |||
if ($node instanceof \OCA\DAV\Connector\Sabre\File) { | |||
//Add OC-Checksum header | |||
/** @var $node File */ | |||
$checksum = $node->getChecksum(); | |||
if ($checksum !== null && $checksum !== '') { | |||
$response->addHeader('OC-Checksum', $checksum); | |||
@@ -383,7 +382,6 @@ class FilesPlugin extends ServerPlugin { | |||
if ($node instanceof \OCA\DAV\Connector\Sabre\File) { | |||
$propFind->handle(self::DOWNLOADURL_PROPERTYNAME, function () use ($node) { | |||
/** @var $node \OCA\DAV\Connector\Sabre\File */ | |||
try { | |||
$directDownloadUrl = $node->getDirectDownload(); | |||
if (isset($directDownloadUrl['url'])) { |
@@ -26,6 +26,7 @@ namespace OCA\Encryption; | |||
use OCA\Encryption\Hooks\Contracts\IHook; | |||
class HookManager { | |||
/** @var IHook[] */ | |||
private $hookInstances = []; | |||
/** | |||
@@ -51,8 +52,6 @@ class HookManager { | |||
foreach ($this->hookInstances as $instance) { | |||
/** | |||
* Fire off the add hooks method of each instance stored in cache | |||
* | |||
* @var $instance IHook | |||
*/ | |||
$instance->addHooks(); | |||
} |
@@ -332,7 +332,7 @@ class ApiController extends Controller { | |||
* | |||
* @NoAdminRequired | |||
* | |||
* @param string | |||
* @param string $folderpath | |||
* @return string | |||
* @throws \OCP\Files\NotFoundException | |||
*/ |
@@ -1,4 +1,4 @@ | |||
<?php /** @var $l \OCP\IL10N */ ?> | |||
<?php /** @var \OCP\IL10N $l */ ?> | |||
<?php $_['appNavigation']->printPage(); ?> | |||
<div id="app-content"> | |||
@@ -1,4 +1,4 @@ | |||
<?php /** @var $l \OCP\IL10N */ ?> | |||
<?php /** @var \OCP\IL10N $l */ ?> | |||
<div id='notification'></div> | |||
<div id="emptycontent" class="hidden"></div> |
@@ -97,15 +97,13 @@ class ListCommand extends Base { | |||
} | |||
protected function execute(InputInterface $input, OutputInterface $output): int { | |||
/** @var StorageConfig[] $mounts */ | |||
if ($input->getOption('all')) { | |||
/** @var $mounts StorageConfig[] */ | |||
$mounts = $this->globalService->getStorageForAllUsers(); | |||
$userId = self::ALL; | |||
} else { | |||
$userId = $input->getArgument('user_id'); | |||
$storageService = $this->getStorageService($userId); | |||
/** @var $mounts StorageConfig[] */ | |||
$mounts = $storageService->getAllStorages(); | |||
} | |||
@@ -114,7 +112,7 @@ class ListCommand extends Base { | |||
} | |||
/** | |||
* @param $userId $userId | |||
* @param string $userId | |||
* @param StorageConfig[] $mounts | |||
* @param InputInterface $input | |||
* @param OutputInterface $output |
@@ -55,7 +55,7 @@ trait UserTrait { | |||
* Override the user from the session | |||
* Unset with ->resetUser() when finished! | |||
* | |||
* @param IUser | |||
* @param IUser $user | |||
* @return self | |||
*/ | |||
public function setUser(IUser $user) { |
@@ -1,4 +1,4 @@ | |||
<?php /** @var $l \OCP\IL10N */ ?> | |||
<?php /** @var \OCP\IL10N $l */ ?> | |||
<div id="controls"> | |||
<div id="file_action_panel"></div> | |||
</div> |
@@ -1466,7 +1466,7 @@ class ShareAPIController extends OCSController { | |||
/** | |||
* Cleanup the remaining locks | |||
* @throws @LockedException | |||
* @throws LockedException | |||
*/ | |||
public function cleanup() { | |||
if ($this->lockedNode !== null) { | |||
@@ -1642,7 +1642,7 @@ class ShareAPIController extends OCSController { | |||
* | |||
* @param Node|null $path | |||
* @param boolean $reshares | |||
* @return void | |||
* @return IShare[] | |||
*/ | |||
private function getAllShares(?Node $path = null, bool $reshares = false) { | |||
// Get all shares |
@@ -54,7 +54,7 @@ use function usort; | |||
class ShareesAPIController extends OCSController { | |||
/** @var userId */ | |||
/** @var string */ | |||
protected $userId; | |||
/** @var IConfig */ |
@@ -63,7 +63,7 @@ class Helper { | |||
/** | |||
* get default share folder | |||
* | |||
* @param \OC\Files\View | |||
* @param \OC\Files\View $view | |||
* @return string | |||
*/ | |||
public static function getShareFolder($view = null) { |
@@ -215,7 +215,7 @@ class SharedMount extends MountPoint implements MoveableMount { | |||
*/ | |||
public function removeMount() { | |||
$mountManager = \OC\Files\Filesystem::getMountManager(); | |||
/** @var $storage \OCA\Files_Sharing\SharedStorage */ | |||
/** @var \OCA\Files_Sharing\SharedStorage $storage */ | |||
$storage = $this->getStorage(); | |||
$result = $storage->unshareStorage(); | |||
$mountManager->removeMount($this->mountPoint); |
@@ -1,4 +1,4 @@ | |||
<?php /** @var $l \OCP\IL10N */ ?> | |||
<?php /** @var \OCP\IL10N $l */ ?> | |||
<div id='notification'></div> | |||
<div id="emptycontent" class="hidden"></div> |
@@ -1,6 +1,6 @@ | |||
<?php | |||
/** @var $l \OCP\IL10N */ | |||
/** @var $_ array */ | |||
/** @var \OCP\IL10N $_ */ | |||
/** @var array $_ */ | |||
?> | |||
<div id="app-content"> | |||
<?php if ($_['previewSupported']): /* This enables preview images for links (e.g. on Facebook, Google+, ...)*/?> |