fix a few psalm errors

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
nextcloud · Dec 20, 2022 · 783e49c · 783e49c
1 parent 42cb621
commit 783e49c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/core/Controller/ReferenceApiController.php b/core/Controller/ReferenceApiController.php
@@ -99,12 +99,7 @@ public function resolve(array $references, int $limit = 1): DataResponse {
  * @return DataResponse
  */
  public function getProvidersInfo(): DataResponse {
- try {
- $providers = $this->referenceManager->getDiscoverableProviders();
- } catch (ContainerExceptionInterface | NotFoundExceptionInterface $e) {
- return new DataResponse(['message' => 'Error getting providers'], Http::STATUS_NOT_FOUND);
- }
-
+ $providers = $this->referenceManager->getDiscoverableProviders();
  $jsonProviders = array_map(static function (IDiscoverableReferenceProvider $provider) {
  return $provider->jsonSerialize();
  }, $providers);

diff --git a/lib/private/Collaboration/Reference/ReferenceManager.php b/lib/private/Collaboration/Reference/ReferenceManager.php
@@ -63,7 +63,7 @@ public function __construct(LinkReferenceProvider $linkReferenceProvider, ICache
  * Extract a list of URLs from a text
  *
  * @param string $text
- * @return array|string[]
+ * @return string[]
  */
  public function extractReferences(string $text): array {
  preg_match_all(IURLGenerator::URL_REGEX, $text, $matches);
@@ -78,8 +78,6 @@ public function extractReferences(string $text): array {
  *
  * @param string $referenceId
  * @return IReference|null
- * @throws ContainerExceptionInterface
- * @throws NotFoundExceptionInterface
  */
  public function getReferenceFromCache(string $referenceId): ?IReference {
  $matchedProvider = $this->getMatchedProvider($referenceId);
@@ -113,8 +111,6 @@ public function getReferenceByCacheKey(string $cacheKey): ?IReference {
  *
  * @param string $referenceId
  * @return IReference|null
- * @throws ContainerExceptionInterface
- * @throws NotFoundExceptionInterface
  */
  public function resolveReference(string $referenceId): ?IReference {
  $matchedProvider = $this->getMatchedProvider($referenceId);
@@ -144,8 +140,6 @@ public function resolveReference(string $referenceId): ?IReference {
  *
  * @param string $referenceId
  * @return IReferenceProvider|null the first matching provider
- * @throws ContainerExceptionInterface
- * @throws NotFoundExceptionInterface
  */
  private function getMatchedProvider(string $referenceId): ?IReferenceProvider {
  $matchedProvider = null;
@@ -195,8 +189,6 @@ public function invalidateCache(string $cachePrefix, ?string $cacheKey = null):
 
  /**
  * @return IReferenceProvider[]
- * @throws ContainerExceptionInterface
- * @throws NotFoundExceptionInterface
  */
  public function getProviders(): array {
  if ($this->providers === null) {
@@ -230,8 +222,6 @@ public function getProviders(): array {
  * If the provider is searchable, also get the list of supported unified search providers
  *
  * @return IDiscoverableReferenceProvider[]
- * @throws ContainerExceptionInterface
- * @throws NotFoundExceptionInterface
  */
  public function getDiscoverableProviders(): array {
  // preserve 0 based index to avoid returning an object in data responses

diff --git a/lib/private/Collaboration/Reference/RenderReferenceEventListener.php b/lib/private/Collaboration/Reference/RenderReferenceEventListener.php
@@ -55,12 +55,7 @@ public function handle(Event $event): void {
  return;
  }
 
- try {
- $providers = $this->manager->getDiscoverableProviders();
- } catch (ContainerExceptionInterface | NotFoundExceptionInterface $e) {
- return;
- }
-
+ $providers = $this->manager->getDiscoverableProviders();
  $jsonProviders = array_map(static function (IDiscoverableReferenceProvider $provider) {
  return $provider->jsonSerialize();
  }, $providers);