eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix further psalm issues

Browse source 
Signed-off-by: Simon L. <szaimen@e.mail.de>
This commit is contained in:
Simon L. 2025-11-05 12:58:18 +01:00
parent cbcc5259bd
commit ab20433940
2 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
php/psalm-baseline.xml
View file

@ -6,12 +6,6 @@
</InvalidOperand> </InvalidOperand>
</file> </file>
<file src="src/Data/ConfigurationManager.php"> <file src="src/Data/ConfigurationManager.php">
<FalsableReturnStatement>
<code><![CDATA[$additionalBackupDirectories]]></code>
</FalsableReturnStatement>
<InvalidFalsableReturnType>
<code><![CDATA[string]]></code>
</InvalidFalsableReturnType>
<PossiblyFalseArgument> <PossiblyFalseArgument>
<code><![CDATA[$ch]]></code> <code><![CDATA[$ch]]></code>
<code><![CDATA[$ch]]></code> <code><![CDATA[$ch]]></code>
@ -19,11 +13,6 @@
<code><![CDATA[$ch]]></code> <code><![CDATA[$ch]]></code>
<code><![CDATA[$ch]]></code> <code><![CDATA[$ch]]></code>
<code><![CDATA[$ch]]></code> <code><![CDATA[$ch]]></code>
<code><![CDATA[$configContent]]></code>
<code><![CDATA[$content]]></code>
<code><![CDATA[$content]]></code>
<code><![CDATA[$dailyBackupFile]]></code>
<code><![CDATA[$dailyBackupFile]]></code>
</PossiblyFalseArgument> </PossiblyFalseArgument>
</file> </file>
<file src="src/Docker/DockerActionManager.php"> <file src="src/Docker/DockerActionManager.php">

19
php/src/Data/ConfigurationManager.php
View file

@ -13,7 +13,7 @@ class ConfigurationManager
{ {
if(file_exists(DataConst::GetConfigFile())) if(file_exists(DataConst::GetConfigFile()))
{ {
$configContent = file_get_contents(DataConst::GetConfigFile()); $configContent = (string)file_get_contents(DataConst::GetConfigFile());
return json_decode($configContent, true, 512, JSON_THROW_ON_ERROR); return json_decode($configContent, true, 512, JSON_THROW_ON_ERROR);
} }
@ -80,10 +80,7 @@ class ConfigurationManager
return ''; return '';
} }
$content = file_get_contents(DataConst::GetBackupArchivesList()); $content = (string)file_get_contents(DataConst::GetBackupArchivesList());
if ($content === '') {
return '';
}
$lastBackupLines = explode("\n", $content); $lastBackupLines = explode("\n", $content);
$lastBackupLine = ""; $lastBackupLine = "";
@ -108,10 +105,7 @@ class ConfigurationManager
return []; return [];
} }
$content = file_get_contents(DataConst::GetBackupArchivesList()); $content = (string)file_get_contents(DataConst::GetBackupArchivesList());
if ($content === '') {
return [];
}
$backupLines = explode("\n", $content); $backupLines = explode("\n", $content);
$backupTimes = []; $backupTimes = [];
@ -795,7 +789,7 @@ class ConfigurationManager
if (!file_exists(DataConst::GetDailyBackupTimeFile())) { if (!file_exists(DataConst::GetDailyBackupTimeFile())) {
return ''; return '';
} }
$dailyBackupFile = file_get_contents(DataConst::GetDailyBackupTimeFile()); $dailyBackupFile = (string)file_get_contents(DataConst::GetDailyBackupTimeFile());
$dailyBackupFileArray = explode("\n", $dailyBackupFile); $dailyBackupFileArray = explode("\n", $dailyBackupFile);
return $dailyBackupFileArray[0]; return $dailyBackupFileArray[0];
} }
@ -804,7 +798,7 @@ class ConfigurationManager
if (!file_exists(DataConst::GetDailyBackupTimeFile())) { if (!file_exists(DataConst::GetDailyBackupTimeFile())) {
return false; return false;
} }
$dailyBackupFile = file_get_contents(DataConst::GetDailyBackupTimeFile()); $dailyBackupFile = (string)file_get_contents(DataConst::GetDailyBackupTimeFile());
$dailyBackupFileArray = explode("\n", $dailyBackupFile); $dailyBackupFileArray = explode("\n", $dailyBackupFile);
if (isset($dailyBackupFileArray[1]) && $dailyBackupFileArray[1] === 'automaticUpdatesAreNotEnabled') { if (isset($dailyBackupFileArray[1]) && $dailyBackupFileArray[1] === 'automaticUpdatesAreNotEnabled') {
return false; return false;
@ -855,8 +849,7 @@ class ConfigurationManager
if (!file_exists(DataConst::GetAdditionalBackupDirectoriesFile())) { if (!file_exists(DataConst::GetAdditionalBackupDirectoriesFile())) {
return ''; return '';
} }
$additionalBackupDirectories = file_get_contents(DataConst::GetAdditionalBackupDirectoriesFile()); return (string)file_get_contents(DataConst::GetAdditionalBackupDirectoriesFile());
return $additionalBackupDirectories;
} }
public function GetAdditionalBackupDirectoriesArray() : array { public function GetAdditionalBackupDirectoriesArray() : array {