Skip to content

Fix psalm errors from the end of the baseline file #32413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 1 commit into from
May 16, 2022
Merged

Fix psalm errors from the end of the baseline file #32413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files_trashbin/lib/Trashbin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ private static function calculateFreeSpace($trashbinSize, $user) {
$availableSpace = $quota;
}

return $availableSpace;
return (int)$availableSpace;
}

/**
Expand Down
40 changes: 1 addition & 39 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4463,11 +4463,9 @@
<InvalidOperand occurrences="1">
<code>$matches[1][$last_match][0]</code>
</InvalidOperand>
<InvalidReturnStatement occurrences="4">
<InvalidReturnStatement occurrences="2">
<code>(INF &gt; 0)? INF: PHP_INT_MAX</code>
<code>INF</code>
<code>max($upload_max_filesize, $post_max_size)</code>
<code>min($upload_max_filesize, $post_max_size)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>int</code>
Expand Down Expand Up @@ -4505,22 +4503,6 @@
<code>\Test\Util\User\Dummy</code>
</UndefinedClass>
</file>
<file src="lib/private/legacy/OC_Util.php">
<InvalidReturnStatement occurrences="1">
<code>OC_Helper::computerFileSize($userQuota)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>float</code>
</InvalidReturnType>
<RedundantCondition occurrences="1">
<code>is_string($expected)</code>
</RedundantCondition>
<TypeDoesNotContainType occurrences="3">
<code>is_bool($expected)</code>
<code>is_bool($setting[1])</code>
<code>is_int($expected)</code>
</TypeDoesNotContainType>
</file>
<file src="lib/public/Server.php">
<InvalidThrow occurrences="2">
<code>ContainerExceptionInterface</code>
Expand Down Expand Up @@ -4611,26 +4593,6 @@
<code>PreconditionNotMetException</code>
</InvalidClass>
</file>
<file src="lib/public/Search/SearchResult.php">
<InvalidArgument occurrences="1">
<code>$cursor</code>
</InvalidArgument>
</file>
<file src="lib/public/Share.php">
<InvalidReturnType occurrences="3">
<code>array</code>
<code>array|bool</code>
<code>mixed</code>
</InvalidReturnType>
</file>
<file src="lib/public/Util.php">
<InvalidReturnStatement occurrences="1">
<code>\OC_Helper::computerFileSize($str)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>float</code>
</InvalidReturnType>
</file>
<file src="remote.php">
<InvalidScalarArgument occurrences="1">
<code>$e-&gt;getCode()</code>
Expand Down
10 changes: 5 additions & 5 deletions lib/private/legacy/OC_Helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static function humanFileSize($bytes) {
/**
* Make a computer file size
* @param string $str file size in human readable format
* @return float|bool a file size in bytes
* @return float|false a file size in bytes
*
* Makes 2kB to 2048.
*
Expand Down Expand Up @@ -420,11 +420,11 @@ public static function freeSpace($dir) {
*/
public static function uploadLimit() {
$ini = \OC::$server->get(IniGetWrapper::class);
$upload_max_filesize = OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
$post_max_size = OCP\Util::computerFileSize($ini->get('post_max_size'));
if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
$upload_max_filesize = (int)OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
$post_max_size = (int)OCP\Util::computerFileSize($ini->get('post_max_size'));
if ($upload_max_filesize === 0 && $post_max_size === 0) {
return INF;
} elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
} elseif ($upload_max_filesize === 0 || $post_max_size === 0) {
return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
} else {
return min($upload_max_filesize, $post_max_size);
Expand Down
21 changes: 3 additions & 18 deletions lib/private/legacy/OC_Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public static function isDefaultExpireDateEnforced() {
* Get the quota of a user
*
* @param IUser|null $user
* @return float Quota bytes
* @return float|\OCP\Files\FileInfo::SPACE_UNLIMITED|false Quota bytes
*/
public static function getUserQuota(?IUser $user) {
if (is_null($user)) {
Expand Down Expand Up @@ -657,20 +657,8 @@ public static function checkServer(\OC\SystemConfig $config) {
}
}
foreach ($dependencies['ini'] as $setting => $expected) {
if (is_bool($expected)) {
if ($iniWrapper->getBool($setting) !== $expected) {
$invalidIniSettings[] = [$setting, $expected];
}
}
if (is_int($expected)) {
if ($iniWrapper->getNumeric($setting) !== $expected) {
$invalidIniSettings[] = [$setting, $expected];
}
}
if (is_string($expected)) {
if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
$invalidIniSettings[] = [$setting, $expected];
}
if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
$invalidIniSettings[] = [$setting, $expected];
}
}

Expand All @@ -682,9 +670,6 @@ public static function checkServer(\OC\SystemConfig $config) {
$webServerRestart = true;
}
foreach ($invalidIniSettings as $setting) {
if (is_bool($setting[1])) {
$setting[1] = $setting[1] ? 'on' : 'off';
}
$errors[] = [
'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),
'hint' => $l->t('Adjusting this setting in php.ini will make Nextcloud run again')
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Search/SearchResult.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ final class SearchResult implements JsonSerializable {
* @param string $name the translated name of the result section or group, e.g. "Mail"
* @param bool $isPaginated
* @param SearchResultEntry[] $entries
* @param null $cursor
* @param ?int|?string $cursor
*
* @since 20.0.0
*/
Expand Down
6 changes: 3 additions & 3 deletions lib/public/Share.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static function getItemSharedWithUser($itemType, $itemSource, $user, $own
* @param int $format (optional) Format type must be defined by the backend
* @param mixed $parameters
* @param bool $includeCollections
* @return array
* @return void
* @since 5.0.0
* @deprecated 17.0.0
*/
Expand All @@ -77,7 +77,7 @@ public static function getItemSharedWithBySource($itemType, $itemSource, $format
* Based on the given token the share information will be returned - password protected shares will be verified
* @param string $token
* @param bool $checkPasswordProtection
* @return array|bool false will be returned in case the token is unknown or unauthorized
* @return void
* @since 5.0.0 - parameter $checkPasswordProtection was added in 7.0.0
* @deprecated 17.0.0
*/
Expand All @@ -93,7 +93,7 @@ public static function getShareByToken($token, $checkPasswordProtection = true)
* @param mixed $parameters
* @param int $limit Number of items to return (optional) Returns all by default
* @param bool $includeCollections
* @return mixed Return depends on format
* @return void
* @since 5.0.0
* @deprecated 17.0.0
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ public static function humanFileSize($bytes) {
/**
* Make a computer file size (2 kB to 2048)
* @param string $str file size in a fancy format
* @return float a file size in bytes
* @return float|false a file size in bytes
*
* Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
* @since 4.0.0
Expand Down