From 8904bf645b30fbdfdcb00a2ea607d752ee69d865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Finnil=C3=A4?= <64466176+MB-Finski@users.noreply.github.com> Date: Tue, 19 Dec 2023 14:29:49 +0200 Subject: [PATCH 1/3] Return providers as indexed array Signed-off-by: MB-Finski --- lib/private/TextToImage/Manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/TextToImage/Manager.php b/lib/private/TextToImage/Manager.php index 86212709c42..30336e4e0dc 100644 --- a/lib/private/TextToImage/Manager.php +++ b/lib/private/TextToImage/Manager.php @@ -83,7 +83,7 @@ class Manager implements IManager { foreach ($context->getTextToImageProviders() as $providerServiceRegistration) { $class = $providerServiceRegistration->getService(); try { - $this->providers[$class] = $this->serverContainer->get($class); + $this->providers[] = $this->serverContainer->get($class); } catch (Throwable $e) { $this->logger->error('Failed to load Text to image provider ' . $class, [ 'exception' => $e, From f27d2bf3526d41ec9ba3b56a1c3b652a6e81885f Mon Sep 17 00:00:00 2001 From: MB-Finski Date: Wed, 20 Dec 2023 07:49:09 +0000 Subject: [PATCH 2/3] Update doc blocks Signed-off-by: MB-Finski --- lib/private/TextToImage/Manager.php | 4 ++-- lib/public/TextToImage/IManager.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/TextToImage/Manager.php b/lib/private/TextToImage/Manager.php index 30336e4e0dc..87d69457f16 100644 --- a/lib/private/TextToImage/Manager.php +++ b/lib/private/TextToImage/Manager.php @@ -66,7 +66,7 @@ class Manager implements IManager { } /** - * @inerhitDocs + * @inheritDoc */ public function getProviders(): array { $context = $this->coordinator->getRegistrationContext(); @@ -313,7 +313,7 @@ class Manager implements IManager { } /** - * @return IProvider[] + * @return list */ private function getPreferredProviders() { $providers = $this->getProviders(); diff --git a/lib/public/TextToImage/IManager.php b/lib/public/TextToImage/IManager.php index 30b88217690..f2092476e78 100644 --- a/lib/public/TextToImage/IManager.php +++ b/lib/public/TextToImage/IManager.php @@ -45,7 +45,7 @@ interface IManager { /** * @since 28.0.0 - * @return IProvider[] + * @return list */ public function getProviders(): array; From 997f6c33cd184e7cb71d91a09423dbace824cb8a Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Tue, 9 Jan 2024 09:41:54 +0100 Subject: [PATCH 3/3] fix(psalm issues) Signed-off-by: Marcel Klehr --- lib/private/TextToImage/Manager.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/private/TextToImage/Manager.php b/lib/private/TextToImage/Manager.php index 87d69457f16..40cab81b5b1 100644 --- a/lib/private/TextToImage/Manager.php +++ b/lib/private/TextToImage/Manager.php @@ -49,7 +49,7 @@ use RuntimeException; use Throwable; class Manager implements IManager { - /** @var ?IProvider[] */ + /** @var ?list */ private ?array $providers = null; private IAppData $appData; @@ -83,7 +83,9 @@ class Manager implements IManager { foreach ($context->getTextToImageProviders() as $providerServiceRegistration) { $class = $providerServiceRegistration->getService(); try { - $this->providers[] = $this->serverContainer->get($class); + /** @var IProvider $provider */ + $provider = $this->serverContainer->get($class); + $this->providers[] = $provider; } catch (Throwable $e) { $this->logger->error('Failed to load Text to image provider ' . $class, [ 'exception' => $e,