upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge pull request #42677 from nextcloud/backport/stable28/42377

Browse source 
[stable28] Return providers as indexed array
This commit is contained in:
Marcel Klehr 2024-01-10 15:29:01 +01:00 committed by GitHub
commit 511790dc80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/private/TextToImage/Manager.php
View file

@ -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();

2
lib/public/TextToImage/IManager.php
View file

@ -45,7 +45,7 @@ interface IManager {
/**
* @since 28.0.0
* @return IProvider[]
* @return list<IProvider>
*/
public function getProviders(): array;