Browse Source

Fix psalm ci (stub). Wrap server container with try-catch

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>
tags/v28.0.0beta1
Andrey Borysenko 9 months ago
parent
commit
d3583d3f30
No account linked to committer's email address
3 changed files with 22 additions and 2 deletions
  1. 15
    0
      build/stubs/app_ecosystem_v2.php
  2. 6
    2
      lib/base.php
  3. 1
    0
      psalm.xml

+ 15
- 0
build/stubs/app_ecosystem_v2.php View File

@@ -0,0 +1,15 @@
<?php

namespace OCA\AppEcosystemV2\Service;

use OCP\IRequest;

class AppEcosystemV2Service {
/**
* @param IRequest $request
* @param bool $isDav
*
* @return bool
*/
public function validateExAppRequestToNC(IRequest $request, bool $isDav = false): bool {}
}

+ 6
- 2
lib/base.php View File

@@ -1187,8 +1187,12 @@ class OC {
if (!$appManager->isInstalled('app_ecosystem_v2')) {
return false;
}
$appEcosystemV2Service = Server::get(OCA\AppEcosystemV2\Service\AppEcosystemV2Service::class);
return $appEcosystemV2Service->validateExAppRequestToNC($request);
try {
$appEcosystemV2Service = Server::get(OCA\AppEcosystemV2\Service\AppEcosystemV2Service::class);
return $appEcosystemV2Service->validateExAppRequestToNC($request);
} catch (\Psr\Container\NotFoundExceptionInterface|\Psr\Container\ContainerExceptionInterface $e) {
return false;
}
}
}


+ 1
- 0
psalm.xml View File

@@ -81,6 +81,7 @@
<file name="build/stubs/zip.php"/>
<file name="build/stubs/psr_container.php"/>
<file name="3rdparty/sabre/uri/lib/functions.php" />
<file name="build/stubs/app_ecosystem_v2.php" />
</stubs>
<issueHandlers>
<LessSpecificReturnStatement errorLevel="error"/>

Loading…
Cancel
Save