Migrate activity app from ILogger

Migrated files in: - `lib\AppInfo` - `lib\Controller` - `lib\Command` Resolves : nextcloud/server#32127 Signed-off-by: fenn-cs <[email protected]>
nextcloud · Jul 9, 2023 · 08b1b68 · 08b1b68
1 parent a743f34
commit 08b1b68
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 131 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -46,7 +46,6 @@
 use OCP\IConfig;
 use OCP\IDateTimeFormatter;
 use OCP\IDBConnection;
-use OCP\ILogger;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
@@ -56,6 +55,7 @@
 use OCP\User\Events\UserDeletedEvent;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'activity';
@@ -122,7 +122,7 @@ public function register(IRegistrationContext $context): void {
 				$c->get(IManager::class),
 				$c->get(IValidator::class),
 				$c->get(IConfig::class),
-				$c->get(ILogger::class)
+				$c->get(LoggerInterface::class),
 			);
 		});
 

diff --git a/lib/Command/SendEmails.php b/lib/Command/SendEmails.php
@@ -27,31 +27,22 @@
 use OCA\Activity\MailQueueHandler;
 use OCA\Activity\UserSettings;
 use OCP\IConfig;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SendEmails extends Base {
-	/** @var MailQueueHandler */
-	protected $queueHandler;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var ILogger */
-	protected $logger;
-
 	/**
 	 * @param MailQueueHandler $queueHandler
 	 * @param IConfig $config
-	 * @param ILogger $logger
+	 * @param LoggerInterface $logger
 	 */
-	public function __construct(MailQueueHandler $queueHandler,
-		IConfig $config,
-		ILogger $logger) {
+	public function __construct(protected MailQueueHandler $queueHandler,
+		protected IConfig $config,
+		protected LoggerInterface $logger) {
 		parent::__construct();
 
 		$this->queueHandler = $queueHandler;

diff --git a/lib/Controller/APIv1Controller.php b/lib/Controller/APIv1Controller.php
@@ -30,18 +30,6 @@
 use OCP\IRequest;
 
 class APIv1Controller extends OCSController {
-	/** @var Data */
-	protected $data;
-
-	/** @var GroupHelper */
-	protected $groupHelper;
-
-	/** @var UserSettings */
-	protected $userSettings;
-
-	/** @var CurrentUser */
-	protected $currentUser;
-
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
@@ -52,16 +40,11 @@ class APIv1Controller extends OCSController {
 	 */
 	public function __construct($appName,
 		IRequest $request,
-		Data $data,
-		GroupHelper $groupHelper,
-		UserSettings $userSettings,
-		CurrentUser $currentUser) {
+		protected Data $data,
+		protected GroupHelper $groupHelper,
+		protected UserSettings $userSettings,
+		protected CurrentUser $currentUser) {
 		parent::__construct($appName, $request);
-
-		$this->data = $data;
-		$this->userSettings = $userSettings;
-		$this->groupHelper = $groupHelper;
-		$this->currentUser = $currentUser;
 	}
 
 	/**

diff --git a/lib/Controller/APIv2Controller.php b/lib/Controller/APIv2Controller.php
@@ -67,54 +67,20 @@ class APIv2Controller extends OCSController {
 	/** @var bool */
 	protected $loadPreviews;
 
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var Data */
-	protected $data;
-
-	/** @var GroupHelper */
-	protected $helper;
-
-	/** @var UserSettings */
-	protected $settings;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IPreview */
-	protected $preview;
-
-	/** @var IMimeTypeDetector */
-	protected $mimeTypeDetector;
-
-	/** @var ViewInfoCache */
-	protected $infoCache;
-
 	public function __construct($appName,
 		IRequest $request,
-		IManager $activityManager,
-		Data $data,
-		GroupHelper $helper,
-		UserSettings $settings,
-		IURLGenerator $urlGenerator,
-		IUserSession $userSession,
-		IPreview $preview,
-		IMimeTypeDetector $mimeTypeDetector,
-		ViewInfoCache $infoCache) {
+		protected IManager $activityManager,
+		protected Data $data,
+		protected GroupHelper $helper,
+		protected UserSettings $settings,
+		protected IURLGenerator $urlGenerator,
+		protected IUserSession $userSession,
+		protected IPreview $preview,
+		protected IMimeTypeDetector $mimeTypeDetector,
+		protected ViewInfoCache $infoCache,
+		) {
 		parent::__construct($appName, $request);
 		$this->activityManager = $activityManager;
-		$this->data = $data;
-		$this->helper = $helper;
-		$this->settings = $settings;
-		$this->urlGenerator = $urlGenerator;
-		$this->userSession = $userSession;
-		$this->preview = $preview;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->infoCache = $infoCache;
 	}
 
 	/**

diff --git a/lib/Controller/ActivitiesController.php b/lib/Controller/ActivitiesController.php
@@ -33,21 +33,6 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class ActivitiesController extends Controller {
-	/** @var IConfig */
-	protected $config;
-
-	/** @var Data */
-	protected $data;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var Navigation */
-	protected $navigation;
-
-	/** @var EventDispatcherInterface */
-	protected $eventDispatcher;
-
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
@@ -59,17 +44,12 @@ class ActivitiesController extends Controller {
 	 */
 	public function __construct($appName,
 		IRequest $request,
-		IConfig $config,
-		Data $data,
-		Navigation $navigation,
-		EventDispatcherInterface $eventDispatcher,
-		IL10N $l10n) {
+		protected IConfig $config,
+		protected Data $data,
+		protected Navigation $navigation,
+		protected EventDispatcherInterface $eventDispatcher,
+		private IL10N $l10n) {
 		parent::__construct($appName, $request);
-		$this->data = $data;
-		$this->config = $config;
-		$this->navigation = $navigation;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->l10n = $l10n;
 	}
 
 	/**

diff --git a/lib/Controller/RemoteActivityController.php b/lib/Controller/RemoteActivityController.php
@@ -36,34 +36,14 @@
 use OCP\IUserManager;
 
 class RemoteActivityController extends OCSController {
-	/** @var IDBConnection */
-	protected $db;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/** @var IActivityManager */
-	protected $activityManager;
-
 	public function __construct($appName,
 		IRequest $request,
-		IDBConnection $db,
-		IUserManager $userManager,
-		IAppManager $appManager,
-		IRootFolder $rootFolder,
-		IActivityManager $activityManager) {
+		protected IDBConnection $db,
+		protected IUserManager $userManager,
+		protected IAppManager $appManager,
+		protected IRootFolder $rootFolder,
+		protected IActivityManager $activityManager) {
 		parent::__construct($appName, $request);
-		$this->db = $db;
-		$this->userManager = $userManager;
-		$this->appManager = $appManager;
-		$this->rootFolder = $rootFolder;
-		$this->activityManager = $activityManager;
 	}
 
 	/**