archive
/
nextcloud
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix psalm errors fron the end of the baseline file

Browse Source 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
pull/34845/head
Carl Schwan 2 years ago committed by John Molakvoæ
parent 220d71d997
commit 3ec8dce3cc
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
8 changed files with 16 additions and 76 deletions
Show Stats Download Patch File Download Diff File

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

@ -801,7 +801,7 @@ class Trashbin {
$availableSpace = $quota;
}
return $availableSpace;
return (int)$availableSpace;
}
/**

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

@ -4404,8 +4404,7 @@
<InvalidReturnType occurrences="1">
<code>IImage|null</code>
</InvalidReturnType>
<InvalidScalarArgument occurrences="2">
<code>$quota</code>
<InvalidScalarArgument occurrences="1">
<code>$this-&gt;lastLogin</code>
</InvalidScalarArgument>
<NullableReturnStatement occurrences="1">
@ -4490,19 +4489,16 @@
<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>
</InvalidReturnType>
<InvalidScalarArgument occurrences="4">
<InvalidScalarArgument occurrences="3">
<code>$includeExtStorage ? 'ext' : false</code>
<code>$path</code>
<code>$quota</code>
<code>'ext'</code>
</InvalidScalarArgument>
<RedundantCondition occurrences="1">
@ -4532,22 +4528,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/AppFramework/ApiController.php">
<NoInterfaceProperties occurrences="1">
<code>$this-&gt;request-&gt;server</code>
@ -4645,29 +4625,4 @@
<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>
</InvalidScalarArgument>
</file>
</files>

8
lib/private/legacy/OC_Helper.php
Unescape Escape View File

@ -420,11 +420,11 @@ class OC_Helper {
*/
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);

19
lib/private/legacy/OC_Util.php
Unescape Escape View File

@ -657,20 +657,8 @@ class OC_Util {
}
}
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];
}
}
@ -682,9 +670,6 @@ class OC_Util {
$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')

2
lib/public/Search/SearchResult.php
Unescape Escape View File

@ -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
*/

6
lib/public/Share.php
Unescape Escape View File

@ -64,7 +64,7 @@ class Share extends \OC\Share\Constants {
* @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
*/
@ -77,7 +77,7 @@ class Share extends \OC\Share\Constants {
* 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
*/
@ -93,7 +93,7 @@ class Share extends \OC\Share\Constants {
* @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
*/

2
lib/public/Util.php
Unescape Escape View File

@ -372,7 +372,7 @@ class Util {
/**
* 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

2
remote.php
Unescape Escape View File

@ -81,7 +81,7 @@ function handleException($e) {
}
if ($e instanceof RemoteException) {
// we shall not log on RemoteException
OC_Template::printErrorPage($e->getMessage(), '', $e->getCode());
OC_Template::printErrorPage($e->getMessage(), '', (int)$e->getCode());
} else {
\OC::$server->getLogger()->logException($e, ['app' => 'remote']);
OC_Template::printExceptionErrorPage($e, $statusCode);

Write Preview
Loading…
Cancel
Save