sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48867 from nextcloud/fix/apps/wrong-missing-casts

pull/48864/head
Kate 2024-10-23 17:47:25 +07:00 committed by GitHub
parent b5ac989ecd f25a71806b
commit c00d49bb55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
Unescape Escape View File

@ -490,7 +490,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
$notification = $this->notificationManager->createNotification();
$notification->setApp('files_sharing')
->setUser($share['user'])
->setObject('remote_share', (int)$share['id']);
->setObject('remote_share', (string)$share['id']);
$this->notificationManager->markProcessed($notification);
$event = $this->activityManager->generateEvent();

2
apps/files_trashbin/lib/Trashbin.php
Unescape Escape View File

@ -980,7 +980,7 @@ class Trashbin implements IEventListener {
$pattern = \OC::$server->getDatabaseConnection()->escapeLikeParameter(basename($filename));
if ($timestamp) {
// fetch for old versions
$escapedTimestamp = \OC::$server->getDatabaseConnection()->escapeLikeParameter($timestamp);
$escapedTimestamp = \OC::$server->getDatabaseConnection()->escapeLikeParameter((string)$timestamp);
$pattern .= '.v%.d' . $escapedTimestamp;
$offset = -strlen($escapedTimestamp) - 2;
} else {

2
apps/user_ldap/ajax/getNewServerConfigPrefix.php
Unescape Escape View File

@ -18,7 +18,7 @@ $serverConnections = $helper->getServerConfigurationPrefixes();
sort($serverConnections);
$lk = array_pop($serverConnections);
$ln = (int)str_replace('s', '', $lk);
$nk = 's' . str_pad($ln + 1, 2, '0', STR_PAD_LEFT);
$nk = 's' . str_pad((string)($ln + 1), 2, '0', STR_PAD_LEFT);
$resultData = ['configPrefix' => $nk];

2
apps/workflowengine/lib/Check/RequestTime.php
Unescape Escape View File

@ -62,7 +62,7 @@ class RequestTime implements ICheck {
[$hour1, $minute1] = explode(':', $time1);
$date1 = new \DateTime('now', new \DateTimeZone($timezone1));
$date1->setTimestamp($currentTimestamp);
$date1->setTime($hour1, $minute1);
$date1->setTime((int)$hour1, (int)$minute1);
return $date1->getTimestamp();
}

17
build/psalm-baseline.xml
Unescape Escape View File

@ -722,9 +722,6 @@
<InvalidReturnType>
<code><![CDATA[string]]></code>
</InvalidReturnType>
<InvalidScalarArgument>
<code><![CDATA[(int)$share['id']]]></code>
</InvalidScalarArgument>
</file>
<file src="apps/federation/lib/DbHandler.php">
<LessSpecificReturnStatement>
@ -978,9 +975,6 @@
<InvalidArgument>
<code><![CDATA[$timestamp]]></code>
</InvalidArgument>
<InvalidScalarArgument>
<code><![CDATA[$timestamp]]></code>
</InvalidScalarArgument>
</file>
<file src="apps/files_versions/appinfo/routes.php">
<InvalidScope>
@ -1072,11 +1066,6 @@
<code><![CDATA[array{0: int, 1: int, 2: int}]]></code>
</InvalidReturnType>
</file>
<file src="apps/user_ldap/ajax/getNewServerConfigPrefix.php">
<InvalidScalarArgument>
<code><![CDATA[$ln + 1]]></code>
</InvalidScalarArgument>
</file>
<file src="apps/user_ldap/appinfo/routes.php">
<InvalidScope>
<code><![CDATA[$this]]></code>
@ -1204,12 +1193,6 @@
<code><![CDATA[$decodedValue[1]]]></code>
</InvalidArgument>
</file>
<file src="apps/workflowengine/lib/Check/RequestTime.php">
<InvalidScalarArgument>
<code><![CDATA[$hour1]]></code>
<code><![CDATA[$minute1]]></code>
</InvalidScalarArgument>
</file>
<file src="apps/workflowengine/lib/Check/TFileCheck.php">
<InvalidArgument>
<code><![CDATA[['app' => Application::APP_ID, 'class' => get_class($subject)]]]></code>