summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/psalm-baseline-ocp.xml18
-rw-r--r--build/psalm-baseline.xml115
2 files changed, 6 insertions, 127 deletions
diff --git a/build/psalm-baseline-ocp.xml b/build/psalm-baseline-ocp.xml
index c3bf00b8926..e993e85e5a2 100644
--- a/build/psalm-baseline-ocp.xml
+++ b/build/psalm-baseline-ocp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
+<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
<file src="lib/private/legacy/OC_Template.php">
<UndefinedClass occurrences="1">
<code>OC</code>
@@ -10,11 +10,6 @@
<code>$this-&gt;request-&gt;server</code>
</NoInterfaceProperties>
</file>
- <file src="lib/public/Server.php">
- <InvalidThrow occurrences="2">
- <code>ContainerExceptionInterface</code>
- </InvalidThrow>
- </file>
<file src="lib/public/AppFramework/App.php">
<InternalMethod occurrences="1">
<code>new RouteConfig($this-&gt;container, $router, $routes)</code>
@@ -23,11 +18,6 @@
<code>\OC</code>
</UndefinedClass>
</file>
- <file src="lib/public/AppFramework/Bootstrap/IBootContext.php">
- <InvalidThrow occurrences="1">
- <code>ContainerExceptionInterface</code>
- </InvalidThrow>
- </file>
<file src="lib/public/AppFramework/Db/Entity.php">
<InvalidNullableReturnType occurrences="1">
<code>string</code>
@@ -133,12 +123,6 @@
<code>\OC</code>
</UndefinedClass>
</file>
- <file src="lib/public/IContainer.php">
- <InvalidThrow occurrences="2">
- <code>ContainerExceptionInterface</code>
- <code>ContainerExceptionInterface</code>
- </InvalidThrow>
- </file>
<file src="lib/public/Template.php">
<UndefinedFunction occurrences="7">
<code>\html_select_options($options, $selected, $params)</code>
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 5c8b4d7e67b..ed7b19eaa7f 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
+<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
<file src="3rdparty/sabre/dav/lib/CalDAV/Calendar.php">
<MoreSpecificImplementedParamType occurrences="1">
<code>$calendarData</code>
@@ -37,9 +37,6 @@
</LessSpecificImplementedReturnType>
</file>
<file src="apps/cloud_federation_api/lib/Controller/RequestHandlerController.php">
- <InvalidScalarArgument occurrences="1">
- <code>$e-&gt;getCode()</code>
- </InvalidScalarArgument>
<TypeDoesNotContainType occurrences="1">
<code>!is_array($notification)</code>
</TypeDoesNotContainType>
@@ -391,11 +388,6 @@
<code>\Sabre\HTTP\toDate($value)</code>
</UndefinedFunction>
</file>
- <file src="apps/dav/lib/Comments/EntityTypeCollection.php">
- <TypeDoesNotContainType occurrences="1">
- <code>!is_string($name)</code>
- </TypeDoesNotContainType>
- </file>
<file src="apps/dav/lib/Comments/RootCollection.php">
<InvalidArgument occurrences="1">
<code>CommentsEntityEvent::EVENT_ENTITY</code>
@@ -437,9 +429,6 @@
<InvalidReturnType occurrences="1">
<code>\Sabre\DAV\INode[]</code>
</InvalidReturnType>
- <InvalidScalarArgument occurrences="1">
- <code>$e-&gt;getCode()</code>
- </InvalidScalarArgument>
<NullArgument occurrences="3">
<code>null</code>
<code>null</code>
@@ -808,7 +797,7 @@
<code>$userSession</code>
<code>$userSession</code>
</RedundantCondition>
- <TypeDoesNotContainType occurrences="2">
+ <TypeDoesNotContainType occurrences="1">
<code>get_class($res) === 'OpenSSLAsymmetricKey'</code>
</TypeDoesNotContainType>
</file>
@@ -952,14 +941,6 @@
<code>null</code>
</NullArgument>
</file>
- <file src="apps/files/lib/Command/TransferOwnership.php">
- <InvalidReturnStatement occurrences="1">
- <code>$e-&gt;getCode() !== 0 ? $e-&gt;getCode() : 1</code>
- </InvalidReturnStatement>
- <InvalidReturnType occurrences="1">
- <code>int</code>
- </InvalidReturnType>
- </file>
<file src="apps/files/lib/Controller/DirectEditingController.php">
<InvalidArgument occurrences="1">
<code>$templateId</code>
@@ -1025,12 +1006,6 @@
<code>$this</code>
</InvalidScope>
</file>
- <file src="apps/files_external/lib/Command/Verify.php">
- <InvalidScalarArgument occurrences="2">
- <code>$e-&gt;getCode()</code>
- <code>$status</code>
- </InvalidScalarArgument>
- </file>
<file src="apps/files_external/lib/Config/ConfigAdapter.php">
<UndefinedClass occurrences="1">
<code>new $objectClass($objectStore)</code>
@@ -1551,13 +1526,6 @@
<code>['app' =&gt; Application::APP_ID, 'class' =&gt; get_class($subject)]</code>
</InvalidArgument>
</file>
- <file src="apps/workflowengine/lib/Controller/AWorkflowController.php">
- <InvalidScalarArgument occurrences="3">
- <code>$e-&gt;getCode()</code>
- <code>$e-&gt;getCode()</code>
- <code>$e-&gt;getCode()</code>
- </InvalidScalarArgument>
- </file>
<file src="apps/workflowengine/lib/Entity/File.php">
<InvalidReturnType occurrences="1">
<code>string</code>
@@ -1768,10 +1736,6 @@
</RedundantCondition>
</file>
<file src="lib/base.php">
- <InternalMethod occurrences="2">
- <code>getAppsNeedingUpgrade</code>
- <code>getIncompatibleApps</code>
- </InternalMethod>
<InvalidArgument occurrences="1">
<code>$restrictions</code>
</InvalidArgument>
@@ -1941,34 +1905,22 @@
<InternalMethod occurrences="1">
<code>setOCSVersion</code>
</InternalMethod>
- <InvalidScalarArgument occurrences="1">
- <code>$code</code>
- </InvalidScalarArgument>
</file>
<file src="lib/private/AppFramework/Middleware/Security/CORSMiddleware.php">
- <InvalidScalarArgument occurrences="1">
- <code>$exception-&gt;getCode()</code>
- </InvalidScalarArgument>
<NoInterfaceProperties occurrences="2">
<code>$this-&gt;request-&gt;server</code>
<code>$this-&gt;request-&gt;server</code>
</NoInterfaceProperties>
</file>
<file src="lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php">
- <InvalidScalarArgument occurrences="6">
+ <InvalidScalarArgument occurrences="4">
<code>$anonLimit</code>
<code>$anonPeriod</code>
- <code>$exception-&gt;getCode()</code>
- <code>$exception-&gt;getCode()</code>
<code>$userLimit</code>
<code>$userPeriod</code>
</InvalidScalarArgument>
</file>
<file src="lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php">
- <InvalidScalarArgument occurrences="2">
- <code>$exception-&gt;getCode()</code>
- <code>$exception-&gt;getCode()</code>
- </InvalidScalarArgument>
<NoInterfaceProperties occurrences="1">
<code>$this-&gt;request-&gt;server</code>
</NoInterfaceProperties>
@@ -1976,16 +1928,6 @@
<code>\OCA\Talk\Controller\PageController</code>
</UndefinedClass>
</file>
- <file src="lib/private/AppFramework/OCS/V1Response.php">
- <InvalidScalarArgument occurrences="1">
- <code>$meta</code>
- </InvalidScalarArgument>
- </file>
- <file src="lib/private/AppFramework/OCS/V2Response.php">
- <InvalidScalarArgument occurrences="1">
- <code>$meta</code>
- </InvalidScalarArgument>
- </file>
<file src="lib/private/AppFramework/Routing/RouteConfig.php">
<InvalidArrayOffset occurrences="1">
<code>$action['url-postfix']</code>
@@ -2007,24 +1949,7 @@
</RedundantCondition>
</file>
<file src="lib/private/Authentication/Token/PublicKeyToken.php">
- <UndefinedMagicMethod occurrences="16">
- <code>parent::getExpires()</code>
- <code>parent::getLastCheck()</code>
- <code>parent::getLoginName()</code>
- <code>parent::getName()</code>
- <code>parent::getPassword()</code>
- <code>parent::getRemember()</code>
- <code>parent::getScope()</code>
- <code>parent::setExpires($expires)</code>
- <code>parent::setLastCheck($time)</code>
- <code>parent::setName($name)</code>
- <code>parent::setPassword($password)</code>
- <code>parent::setPasswordInvalid($invalid)</code>
- <code>parent::setScope((string)$scope)</code>
- <code>parent::setScope(json_encode($scope))</code>
- <code>parent::setToken($token)</code>
- <code>parent::setType(IToken::WIPE_TOKEN)</code>
- </UndefinedMagicMethod>
+ <UndefinedMagicMethod occurrences="16"/>
</file>
<file src="lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php">
<InvalidReturnStatement occurrences="1"/>
@@ -2183,9 +2108,6 @@
<InvalidReturnType occurrences="1">
<code>string</code>
</InvalidReturnType>
- <InvalidScalarArgument occurrences="1">
- <code>$e-&gt;getCode()</code>
- </InvalidScalarArgument>
<ParamNameMismatch occurrences="2">
<code>$seqName</code>
<code>$statement</code>
@@ -2999,9 +2921,8 @@
</LessSpecificImplementedReturnType>
</file>
<file src="lib/private/LargeFileHelper.php">
- <InvalidOperand occurrences="2">
+ <InvalidOperand occurrences="1">
<code>$matches[1]</code>
- <code>$result</code>
</InvalidOperand>
<InvalidScalarArgument occurrences="1">
<code>$data</code>
@@ -3112,9 +3033,6 @@
<code>$id</code>
</ParamNameMismatch>
</file>
- <file src="lib/private/Notification/Manager.php">
- <InvalidCatch occurrences="3"/>
- </file>
<file src="lib/private/Preview/BackgroundCleanupJob.php">
<InvalidReturnStatement occurrences="1">
<code>[]</code>
@@ -3271,7 +3189,6 @@
<InvalidArgument occurrences="1">
<code>new GenericEvent($user)</code>
</InvalidArgument>
- <InvalidCatch occurrences="1"/>
<UndefinedDocblockClass occurrences="1">
<code>\OC\OCSClient</code>
</UndefinedDocblockClass>
@@ -3662,11 +3579,6 @@
<code>new RouteConfig($this-&gt;container, $router, $routes)</code>
</InternalMethod>
</file>
- <file src="lib/public/AppFramework/Bootstrap/IBootContext.php">
- <InvalidThrow occurrences="1">
- <code>ContainerExceptionInterface</code>
- </InvalidThrow>
- </file>
<file src="lib/public/AppFramework/Db/Entity.php">
<InvalidNullableReturnType occurrences="1">
<code>string</code>
@@ -3703,21 +3615,4 @@
<code>array</code>
</InvalidParamDefault>
</file>
- <file src="lib/public/IContainer.php">
- <InvalidThrow occurrences="2">
- <code>ContainerExceptionInterface</code>
- <code>ContainerExceptionInterface</code>
- </InvalidThrow>
- </file>
- <file src="lib/public/Server.php">
- <InvalidThrow occurrences="2">
- <code>ContainerExceptionInterface</code>
- <code>NotFoundExceptionInterface</code>
- </InvalidThrow>
- </file>
- <file src="remote.php">
- <InvalidScalarArgument occurrences="1">
- <code>$e-&gt;getCode()</code>
- </InvalidScalarArgument>
- </file>
</files>