aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/cloud_federation_api/lib/Capabilities.php3
-rw-r--r--apps/files/lib/Capabilities.php2
-rw-r--r--apps/files_sharing/lib/Capabilities.php2
-rw-r--r--apps/files_sharing/src/collaborationresources.js44
-rw-r--r--apps/files_trashbin/lib/Capabilities.php2
-rw-r--r--apps/files_versions/lib/Capabilities.php2
-rw-r--r--apps/provisioning_api/lib/Capabilities.php2
-rw-r--r--apps/theming/lib/Capabilities.php2
-rw-r--r--apps/user_status/lib/Capabilities.php3
-rw-r--r--apps/weather_status/lib/Capabilities.php3
-rw-r--r--build/psalm-baseline-ocp.xml8
-rw-r--r--build/psalm-baseline.xml75
-rw-r--r--lib/private/OCS/CoreCapabilities.php2
-rw-r--r--lib/public/Capabilities/ICapability.php21
14 files changed, 15 insertions, 156 deletions
diff --git a/apps/cloud_federation_api/lib/Capabilities.php b/apps/cloud_federation_api/lib/Capabilities.php
index 6164c0e0dba..91fd5219215 100644
--- a/apps/cloud_federation_api/lib/Capabilities.php
+++ b/apps/cloud_federation_api/lib/Capabilities.php
@@ -36,9 +36,6 @@ class Capabilities implements ICapability {
/**
* Function an app uses to return the capabilities
- *
- * @return array Array containing the apps capabilities
- * @since 8.2.0
*/
public function getCapabilities() {
$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
diff --git a/apps/files/lib/Capabilities.php b/apps/files/lib/Capabilities.php
index 3eb43578351..5cb976a47be 100644
--- a/apps/files/lib/Capabilities.php
+++ b/apps/files/lib/Capabilities.php
@@ -38,8 +38,6 @@ class Capabilities implements ICapability {
/**
* Return this classes capabilities
- *
- * @return array
*/
public function getCapabilities() {
return [
diff --git a/apps/files_sharing/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php
index 58104864631..8b1160aeb63 100644
--- a/apps/files_sharing/lib/Capabilities.php
+++ b/apps/files_sharing/lib/Capabilities.php
@@ -50,8 +50,6 @@ class Capabilities implements ICapability {
/**
* Return this classes capabilities
- *
- * @return array
*/
public function getCapabilities() {
$res = [];
diff --git a/apps/files_sharing/src/collaborationresources.js b/apps/files_sharing/src/collaborationresources.js
deleted file mode 100644
index 0175993a2f1..00000000000
--- a/apps/files_sharing/src/collaborationresources.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @copyright Copyright (c) 2019 Julius Härtl <jus@bitgrid.net>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license AGPL-3.0-or-later
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-import Vue from 'vue'
-import Vuex from 'vuex'
-import NcPopoverMenu from '@nextcloud/vue/dist/Components/NcPopoverMenu.js'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
-import ClickOutside from 'vue-click-outside'
-
-import View from './views/CollaborationView.vue'
-
-Vue.prototype.t = t
-Tooltip.options.defaultHtml = false
-
-// eslint-disable-next-line vue/match-component-file-name
-Vue.component('NcPopoverMenu', NcPopoverMenu)
-Vue.directive('ClickOutside', ClickOutside)
-Vue.directive('Tooltip', Tooltip)
-Vue.use(Vuex)
-
-export {
- Vue,
- View,
-}
diff --git a/apps/files_trashbin/lib/Capabilities.php b/apps/files_trashbin/lib/Capabilities.php
index 28acf0c8d27..c0788ff7308 100644
--- a/apps/files_trashbin/lib/Capabilities.php
+++ b/apps/files_trashbin/lib/Capabilities.php
@@ -33,8 +33,6 @@ class Capabilities implements ICapability {
/**
* Return this classes capabilities
- *
- * @return array
*/
public function getCapabilities() {
return [
diff --git a/apps/files_versions/lib/Capabilities.php b/apps/files_versions/lib/Capabilities.php
index afc6fa39da7..6439c18772b 100644
--- a/apps/files_versions/lib/Capabilities.php
+++ b/apps/files_versions/lib/Capabilities.php
@@ -42,8 +42,6 @@ class Capabilities implements ICapability {
/**
* Return this classes capabilities
- *
- * @return array
*/
public function getCapabilities() {
$groupFolderInstalled = $this->appManager->isInstalled('groupfolders');
diff --git a/apps/provisioning_api/lib/Capabilities.php b/apps/provisioning_api/lib/Capabilities.php
index 835bbfe9b5c..614c20e66a8 100644
--- a/apps/provisioning_api/lib/Capabilities.php
+++ b/apps/provisioning_api/lib/Capabilities.php
@@ -37,8 +37,6 @@ class Capabilities implements ICapability {
/**
* Function an app uses to return the capabilities
- *
- * @return array Array containing the apps capabilities
*/
public function getCapabilities() {
$federatedScopeEnabled = $this->appManager->isEnabledForUser('federation');
diff --git a/apps/theming/lib/Capabilities.php b/apps/theming/lib/Capabilities.php
index 10828619e60..5c063715f43 100644
--- a/apps/theming/lib/Capabilities.php
+++ b/apps/theming/lib/Capabilities.php
@@ -64,8 +64,6 @@ class Capabilities implements IPublicCapability {
/**
* Return this classes capabilities
- *
- * @return array
*/
public function getCapabilities() {
$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', '');
diff --git a/apps/user_status/lib/Capabilities.php b/apps/user_status/lib/Capabilities.php
index 5b3e105d31a..67e73f2733c 100644
--- a/apps/user_status/lib/Capabilities.php
+++ b/apps/user_status/lib/Capabilities.php
@@ -40,9 +40,6 @@ class Capabilities implements ICapability {
$this->emojiHelper = $emojiHelper;
}
- /**
- * @inheritDoc
- */
public function getCapabilities() {
return [
'user_status' => [
diff --git a/apps/weather_status/lib/Capabilities.php b/apps/weather_status/lib/Capabilities.php
index c9de0039a39..60cbb4602fd 100644
--- a/apps/weather_status/lib/Capabilities.php
+++ b/apps/weather_status/lib/Capabilities.php
@@ -43,9 +43,6 @@ class Capabilities implements ICapability {
public function __construct() {
}
- /**
- * @inheritDoc
- */
public function getCapabilities() {
return [
Application::APP_ID => [
diff --git a/build/psalm-baseline-ocp.xml b/build/psalm-baseline-ocp.xml
index d34553109b3..40b69d00d31 100644
--- a/build/psalm-baseline-ocp.xml
+++ b/build/psalm-baseline-ocp.xml
@@ -26,14 +26,6 @@
<code>$column</code>
</NullableReturnStatement>
</file>
- <file src="lib/public/AppFramework/Http/JSONResponse.php">
- <InvalidReturnStatement>
- <code><![CDATA[$this->data]]></code>
- </InvalidReturnStatement>
- <InvalidReturnType>
- <code>array</code>
- </InvalidReturnType>
- </file>
<file src="lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php">
<UndefinedClass>
<code>\OC</code>
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 0963e517c68..59132110977 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -63,11 +63,6 @@
<code>IEventListener</code>
</MissingTemplateParam>
</file>
- <file src="apps/comments/lib/Search/Result.php">
- <InvalidArgument>
- <code><![CDATA[(int) $comment->getId()]]></code>
- </InvalidArgument>
- </file>
<file src="apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php">
<MissingTemplateParam>
<code>IEventListener</code>
@@ -439,42 +434,15 @@
<code>$groups</code>
</InvalidPropertyAssignmentValue>
</file>
- <file src="apps/dav/lib/Comments/CommentNode.php">
- <InvalidNullableReturnType>
- <code>int</code>
- </InvalidNullableReturnType>
- <NullableReturnStatement>
- <code>null</code>
- </NullableReturnStatement>
- </file>
<file src="apps/dav/lib/Comments/CommentsPlugin.php">
- <InvalidArgument>
- <code>200</code>
- </InvalidArgument>
- <InvalidScalarArgument>
- <code>$args['datetime']</code>
- </InvalidScalarArgument>
<UndefinedFunction>
<code>\Sabre\HTTP\toDate($value)</code>
</UndefinedFunction>
</file>
- <file src="apps/dav/lib/Comments/EntityTypeCollection.php">
- <TypeDoesNotContainType>
- <code>!is_string($name)</code>
- </TypeDoesNotContainType>
- </file>
<file src="apps/dav/lib/Comments/RootCollection.php">
<InvalidArgument>
<code>CommentsEntityEvent::EVENT_ENTITY</code>
</InvalidArgument>
- <InvalidNullableReturnType>
- <code>\Sabre\DAV\INode[]</code>
- <code>int</code>
- </InvalidNullableReturnType>
- <NullableReturnStatement>
- <code><![CDATA[$this->entityTypeCollections]]></code>
- <code>null</code>
- </NullableReturnStatement>
<TooManyArguments>
<code>dispatch</code>
</TooManyArguments>
@@ -521,9 +489,6 @@
<InvalidNullableReturnType>
<code>bool</code>
</InvalidNullableReturnType>
- <NullableReturnStatement>
- <code>$resultFileIds</code>
- </NullableReturnStatement>
<TooManyArguments>
<code>new PreconditionFailed('Cannot filter by non-existing tag', 0, $e)</code>
</TooManyArguments>
@@ -1864,9 +1829,6 @@
</RedundantCast>
</file>
<file src="core/Controller/UnifiedSearchController.php">
- <NullArgument>
- <code>null</code>
- </NullArgument>
<UndefinedInterfaceMethod>
<code>findMatchingRoute</code>
</UndefinedInterfaceMethod>
@@ -2247,21 +2209,7 @@
<code>$serializedCommand</code>
</ParamNameMismatch>
</file>
- <file src="lib/private/Comments/Comment.php">
- <ImplementedReturnTypeMismatch>
- <code>\DateTime|null</code>
- </ImplementedReturnTypeMismatch>
- <ParamNameMismatch>
- <code>$timestamp</code>
- </ParamNameMismatch>
- <TypeDoesNotContainType>
- <code>!is_array($mentions[0])</code>
- </TypeDoesNotContainType>
- </file>
<file src="lib/private/Comments/Manager.php">
- <InvalidDocblock>
- <code>public function getForObjectSince(</code>
- </InvalidDocblock>
<RedundantCast>
<code>(string)$id</code>
</RedundantCast>
@@ -2678,9 +2626,6 @@
</InvalidReturnStatement>
</file>
<file src="lib/private/Files/Node/Node.php">
- <ImplementedReturnTypeMismatch>
- <code>Node</code>
- </ImplementedReturnTypeMismatch>
<InvalidArgument>
<code>'\OCP\Files::' . $hook</code>
</InvalidArgument>
@@ -2705,9 +2650,6 @@
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/Files/Node/Root.php">
- <ImplementedReturnTypeMismatch>
- <code>Node</code>
- </ImplementedReturnTypeMismatch>
<InvalidNullableReturnType>
<code>\OC\User\User</code>
</InvalidNullableReturnType>
@@ -2785,9 +2727,6 @@
<code>ArrayCache</code>
<code>ArrayCache</code>
</InvalidClass>
- <InvalidNullableReturnType>
- <code>getETag</code>
- </InvalidNullableReturnType>
<InvalidReturnStatement>
<code><![CDATA[$response->getBody()]]></code>
</InvalidReturnStatement>
@@ -3728,26 +3667,12 @@
<code>$column</code>
</NullableReturnStatement>
</file>
- <file src="lib/public/AppFramework/Http/JSONResponse.php">
- <InvalidReturnStatement>
- <code><![CDATA[$this->data]]></code>
- </InvalidReturnStatement>
- <InvalidReturnType>
- <code>array</code>
- </InvalidReturnType>
- </file>
<file src="lib/public/Authentication/TwoFactorAuth/IProvider.php">
<AmbiguousConstantInheritance>
<code>EVENT_FAILED</code>
<code>EVENT_SUCCESS</code>
</AmbiguousConstantInheritance>
</file>
- <file src="lib/public/BackgroundJob/TimedJob.php">
- <MoreSpecificImplementedParamType>
- <code>$jobList</code>
- <code>$jobList</code>
- </MoreSpecificImplementedParamType>
- </file>
<file src="lib/public/Cache/CappedMemoryCache.php">
<MissingTemplateParam>
<code>\ArrayAccess</code>
diff --git a/lib/private/OCS/CoreCapabilities.php b/lib/private/OCS/CoreCapabilities.php
index 2c630531b17..9cead57c6a3 100644
--- a/lib/private/OCS/CoreCapabilities.php
+++ b/lib/private/OCS/CoreCapabilities.php
@@ -44,8 +44,6 @@ class CoreCapabilities implements ICapability {
/**
* Return this classes capabilities
- *
- * @return array
*/
public function getCapabilities() {
return [
diff --git a/lib/public/Capabilities/ICapability.php b/lib/public/Capabilities/ICapability.php
index fed1dba49d1..2d3f5215736 100644
--- a/lib/public/Capabilities/ICapability.php
+++ b/lib/public/Capabilities/ICapability.php
@@ -25,11 +25,8 @@ namespace OCP\Capabilities;
* Minimal interface that has to be implemented for a class to be considered
* a capability.
*
- * In an application use:
- * $this->getContainer()->registerCapability('OCA\MY_APP\Capabilities');
- * To register capabilities.
- *
- * The class 'OCA\MY_APP\Capabilities' must then implement ICapability
+ * In an application use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerCapability
+ * to register capabilities.
*
* @since 8.2.0
*/
@@ -37,7 +34,19 @@ interface ICapability {
/**
* Function an app uses to return the capabilities
*
- * @return array Array containing the apps capabilities
+ * ```php
+ * return [
+ * 'myapp' => [
+ * 'awesomefeature' => true,
+ * 'featureversion' => 3,
+ * ],
+ * 'morecomplex' => [
+ * 'a' => [1, 2],
+ * ],
+ * ];
+ * ```
+ *
+ * @return array<string, array<string, mixed>> Indexed array containing the app's capabilities
* @since 8.2.0
*/
public function getCapabilities();