fix a few psalm errors

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
nextcloud · Jan 5, 2023 · 34893d7 · 34893d7
1 parent 843ddee
commit 34893d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 30 deletions.
diff --git a/core/Controller/ReferenceApiController.php b/core/Controller/ReferenceApiController.php
@@ -24,13 +24,10 @@
 
 namespace OC\Core\Controller;
 
-use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\Collaboration\Reference\IDiscoverableReferenceProvider;
 use OCP\Collaboration\Reference\IReferenceManager;
 use OCP\IRequest;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
 
 class ReferenceApiController extends \OCP\AppFramework\OCSController {
 	private IReferenceManager $referenceManager;
@@ -99,12 +96,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
@@ -34,9 +34,7 @@
 use OCP\ICache;
 use OCP\ICacheFactory;
 use OCP\IURLGenerator;
-use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
-use Psr\Container\NotFoundExceptionInterface;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
@@ -63,7 +61,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 +76,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 +109,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 +138,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 +187,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 +220,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
@@ -31,8 +31,6 @@
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\EventDispatcher\IEventListener;
 use OCP\IInitialStateService;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
 
 class RenderReferenceEventListener implements IEventListener {
 	private IReferenceManager $manager;
@@ -55,12 +53,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);