Browse Source
Merge pull request #42377 from nextcloud/fix/text-to-image-manager
Fix(text2image): Return providers as indexed array
pull/42679/head
Joas Schilling
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
5 deletions
-
lib/private/TextToImage/Manager.php
-
lib/public/TextToImage/IManager.php
|
|
|
@ -49,7 +49,7 @@ use RuntimeException; |
|
|
|
use Throwable; |
|
|
|
|
|
|
|
class Manager implements IManager { |
|
|
|
/** @var ?IProvider[] */ |
|
|
|
/** @var ?list<IProvider> */ |
|
|
|
private ?array $providers = null; |
|
|
|
private IAppData $appData; |
|
|
|
|
|
|
|
@ -66,7 +66,7 @@ class Manager implements IManager { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @inerhitDocs |
|
|
|
* @inheritDoc |
|
|
|
*/ |
|
|
|
public function getProviders(): array { |
|
|
|
$context = $this->coordinator->getRegistrationContext(); |
|
|
|
@ -83,7 +83,9 @@ class Manager implements IManager { |
|
|
|
foreach ($context->getTextToImageProviders() as $providerServiceRegistration) { |
|
|
|
$class = $providerServiceRegistration->getService(); |
|
|
|
try { |
|
|
|
$this->providers[$class] = $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, |
|
|
|
@ -313,7 +315,7 @@ class Manager implements IManager { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @return IProvider[] |
|
|
|
* @return list<IProvider> |
|
|
|
*/ |
|
|
|
private function getPreferredProviders() { |
|
|
|
$providers = $this->getProviders(); |
|
|
|
|
|
|
|
@ -45,7 +45,7 @@ interface IManager { |
|
|
|
|
|
|
|
/** |
|
|
|
* @since 28.0.0 |
|
|
|
* @return IProvider[] |
|
|
|
* @return list<IProvider> |
|
|
|
*/ |
|
|
|
public function getProviders(): array; |
|
|
|
|
|
|
|
|