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

move containers-definition-path to Dataconst

Browse source 
Signed-off-by: Simon L. <szaimen@e.mail.de>
This commit is contained in:
Simon L. 2025-11-05 11:36:46 +01:00
parent 4ba7f1ed64
commit 897e3e7e6e
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
php/psalm-baseline.xml
View file

@ -3,7 +3,6 @@
<file src="src/ContainerDefinitionFetcher.php"> <file src="src/ContainerDefinitionFetcher.php">
<PossiblyFalseArgument> <PossiblyFalseArgument>
<code><![CDATA[file_get_contents($path)]]></code> <code><![CDATA[file_get_contents($path)]]></code>
<code><![CDATA[file_get_contents(__DIR__ . '/../containers.json')]]></code>
</PossiblyFalseArgument> </PossiblyFalseArgument>
</file> </file>
<file src="src/Controller/DockerController.php"> <file src="src/Controller/DockerController.php">
@ -36,6 +35,7 @@
<file src="src/Data/DataConst.php"> <file src="src/Data/DataConst.php">
<FalsableReturnStatement> <FalsableReturnStatement>
<code><![CDATA[realpath(__DIR__ . '/../cool-seccomp-profile.json')]]></code> <code><![CDATA[realpath(__DIR__ . '/../cool-seccomp-profile.json')]]></code>
<code><![CDATA[realpath(__DIR__ . '/../containers.json')]]></code>
<code><![CDATA[realpath(__DIR__ . '/../../../community-containers/')]]></code> <code><![CDATA[realpath(__DIR__ . '/../../../community-containers/')]]></code>
<code><![CDATA[realpath(__DIR__ . '/../../data/')]]></code> <code><![CDATA[realpath(__DIR__ . '/../../data/')]]></code>
<code><![CDATA[realpath(__DIR__ . '/../../session/')]]></code> <code><![CDATA[realpath(__DIR__ . '/../../session/')]]></code>
@ -45,6 +45,7 @@
<code><![CDATA[string]]></code> <code><![CDATA[string]]></code>
<code><![CDATA[string]]></code> <code><![CDATA[string]]></code>
<code><![CDATA[string]]></code> <code><![CDATA[string]]></code>
<code><![CDATA[string]]></code>
</InvalidFalsableReturnType> </InvalidFalsableReturnType>
</file> </file>
<file src="src/Docker/DockerActionManager.php"> <file src="src/Docker/DockerActionManager.php">

2
php/src/ContainerDefinitionFetcher.php
View file

@ -38,7 +38,7 @@ readonly class ContainerDefinitionFetcher {
*/ */
private function GetDefinition(): array private function GetDefinition(): array
{ {
$data = json_decode(file_get_contents(__DIR__ . '/../containers.json'), true); $data = json_decode(file_get_contents(DataConst::GetContainersDefinitionPath()), true);
$additionalContainerNames = []; $additionalContainerNames = [];
foreach ($this->configurationManager->GetEnabledCommunityContainers() as $communityContainer) { foreach ($this->configurationManager->GetEnabledCommunityContainers() as $communityContainer) {

4
php/src/Data/DataConst.php
View file

@ -62,4 +62,8 @@ class DataConst {
public static function GetCollaboraSeccompProfilePath() : string { public static function GetCollaboraSeccompProfilePath() : string {
return realpath(__DIR__ . '/../cool-seccomp-profile.json'); return realpath(__DIR__ . '/../cool-seccomp-profile.json');
} }
public static function GetContainersDefinitionPath() : string {
return realpath(__DIR__ . '/../containers.json');
}
} }