diff options
| -rw-r--r-- | apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/Trashbin.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/ajax/getNewServerConfigPrefix.php | 2 | ||||
| -rw-r--r-- | apps/workflowengine/lib/Check/RequestTime.php | 2 | ||||
| -rw-r--r-- | build/psalm-baseline.xml | 17 |
5 files changed, 4 insertions, 21 deletions
diff --git a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php index 7e07703f430..029e94eeef8 100644 --- a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php +++ b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php @@ -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(); diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index f6791f78a38..32fd81465fa 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -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 { diff --git a/apps/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php index 9ee225ddaa0..a91c3c516ab 100644 --- a/apps/user_ldap/ajax/getNewServerConfigPrefix.php +++ b/apps/user_ldap/ajax/getNewServerConfigPrefix.php @@ -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]; diff --git a/apps/workflowengine/lib/Check/RequestTime.php b/apps/workflowengine/lib/Check/RequestTime.php index f4d2093dc50..b6b4e9176c2 100644 --- a/apps/workflowengine/lib/Check/RequestTime.php +++ b/apps/workflowengine/lib/Check/RequestTime.php @@ -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(); } diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index fbc5a4ac4fc..90d58778832 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -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> |