1 files changed, 38 insertions, 52 deletions

diff --git a/lib/private/Contacts/ContactsMenu/ActionProviderStore.php b/lib/private/Contacts/ContactsMenu/ActionProviderStore.php
index 5513dd06362..b760de03a04 100644
--- a/lib/private/Contacts/ContactsMenu/ActionProviderStore.php
+++ b/lib/private/Contacts/ContactsMenu/ActionProviderStore.php
@@ -1,24 +1,10 @@
 <?php
+
+declare(strict_types=1);
+
 /**
- * @copyright 2017 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace OC\Contacts\ContactsMenu;
@@ -26,54 +12,53 @@ namespace OC\Contacts\ContactsMenu;
 use Exception;
 use OC\App\AppManager;
 use OC\Contacts\ContactsMenu\Providers\EMailProvider;
+use OC\Contacts\ContactsMenu\Providers\LocalTimeProvider;
+use OC\Contacts\ContactsMenu\Providers\ProfileProvider;
 use OCP\AppFramework\QueryException;
+use OCP\Contacts\ContactsMenu\IBulkProvider;
 use OCP\Contacts\ContactsMenu\IProvider;
-use OCP\ILogger;
 use OCP\IServerContainer;
 use OCP\IUser;
+use Psr\Log\LoggerInterface;
 
 class ActionProviderStore {
-
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/** @var AppManager */
-	private $appManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IServerContainer $serverContainer
-	 * @param AppManager $appManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
-		$this->serverContainer = $serverContainer;
-		$this->appManager = $appManager;
-		$this->logger = $logger;
+	public function __construct(
+		private IServerContainer $serverContainer,
+		private AppManager $appManager,
+		private LoggerInterface $logger,
+	) {
 	}
 
 	/**
-	 * @param IUser $user
-	 * @return IProvider[]
+	 * @return list<IProvider|IBulkProvider>
 	 * @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);
+		/** @var list<IProvider|IBulkProvider> $providers */
 		$providers = [];
 
 		foreach ($allClasses as $class) {
 			try {
-				$providers[] = $this->serverContainer->query($class);
+				$provider = $this->serverContainer->get($class);
+				if ($provider instanceof IProvider || $provider instanceof IBulkProvider) {
+					$providers[] = $provider;
+				} else {
+					$this->logger->warning('Ignoring invalid contacts menu provider', [
+						'class' => $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,21 +68,22 @@ class ActionProviderStore {
 	/**
 	 * @return string[]
 	 */
-	private function getServerProviderClasses() {
+	private function getServerProviderClasses(): array {
 		return [
+			ProfileProvider::class,
+			LocalTimeProvider::class,
 			EMailProvider::class,
 		];
 	}
 
 	/**
-	 * @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;
 			}