mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pimp ActionProviderStore 

* Fix paradoxale condition
* Add types
* Move away from ILogger

Makes psalm happy, and thus me happy

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2021-03-04 12:29:49 +01:00
parent c3361a2b13
commit f04a2ce19f
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/private/Contacts/ContactsMenu/ActionProviderStore.php
View File

@ -1,4 +1,6 @@
<?php
declare(strict_types=1);
/**
* @copyright 2017 Christoph Wurst <christoph@winzerhof-wurst.at>
*
@ -28,9 +30,9 @@ use OC\App\AppManager;
use OC\Contacts\ContactsMenu\Providers\EMailProvider;
use OCP\AppFramework\QueryException;
use OCP\Contacts\ContactsMenu\IProvider;
use OCP\ILogger;
use OCP\IServerContainer;
use OCP\IUser;
use Psr\Log\LoggerInterface;
class ActionProviderStore {
@ -40,15 +42,10 @@ class ActionProviderStore {
/** @var AppManager */
private $appManager;
/** @var ILogger */
/** @var LoggerInterface */
private $logger;
/**
* @param IServerContainer $serverContainer
* @param AppManager $appManager
* @param ILogger $logger
*/
public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
public function __construct(IServerContainer $serverContainer, AppManager $appManager, LoggerInterface $logger) {
$this->serverContainer = $serverContainer;
$this->appManager = $appManager;
$this->logger = $logger;
@ -59,7 +56,7 @@ class ActionProviderStore {
* @return IProvider[]
* @throws Exception
*/
public function getProviders(IUser $user) {
public function getProviders(IUser $user): array {
$appClasses = $this->getAppProviderClasses($user);
$providerClasses = $this->getServerProviderClasses();
$allClasses = array_merge($providerClasses, $appClasses);
@ -69,11 +66,13 @@ class ActionProviderStore {
try {
$providers[] = $this->serverContainer->query($class);
} catch (QueryException $ex) {
$this->logger->logException($ex, [
'message' => "Could not load contacts menu action provider $class",
'app' => 'core',
]);
throw new Exception("Could not load contacts menu action provider");
$this->logger->error('Could not load contacts menu action provider ' . $class,
[
'app' => 'core',
'exception' => $ex,
]
);
throw new Exception('Could not load contacts menu action provider');
}
}
@ -83,7 +82,7 @@ class ActionProviderStore {
/**
* @return string[]
*/
private function getServerProviderClasses() {
private function getServerProviderClasses(): array {
return [
EMailProvider::class,
];
@ -93,11 +92,11 @@ class ActionProviderStore {
* @param IUser $user
* @return string[]
*/
private function getAppProviderClasses(IUser $user) {
private function getAppProviderClasses(IUser $user): array {
return array_reduce($this->appManager->getEnabledAppsForUser($user), function ($all, $appId) {
$info = $this->appManager->getAppInfo($appId);
if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
if (!isset($info['contactsmenu'])) {
// Nothing to add
return $all;
}

6
tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
View File

@ -30,9 +30,9 @@ use OC\Contacts\ContactsMenu\Providers\EMailProvider;
use OCP\App\IAppManager;
use OCP\AppFramework\QueryException;
use OCP\Contacts\ContactsMenu\IProvider;
use OCP\ILogger;
use OCP\IServerContainer;
use OCP\IUser;
use Psr\Log\LoggerInterface;
use Test\TestCase;
class ActionProviderStoreTest extends TestCase {
@ -43,7 +43,7 @@ class ActionProviderStoreTest extends TestCase {
/** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
private $appManager;
/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
private $logger;
/** @var ActionProviderStore */
@ -54,7 +54,7 @@ class ActionProviderStoreTest extends TestCase {
$this->serverContainer = $this->createMock(IServerContainer::class);
$this->appManager = $this->createMock(AppManager::class);
$this->logger = $this->createMock(ILogger::class);
$this->logger = $this->createMock(LoggerInterface::class);
$this->actionProviderStore = new ActionProviderStore($this->serverContainer, $this->appManager, $this->logger);
}