cleanup PR

reset some phar changes in unchanged files, better commenting, fix a minor merge mistake

Signed-off-by: Marvin Winkens <m.winkens@fz-juelich.de>

lib/Activity/Provider.php

@@ -135,7 +135,7 @@ protected function getParameters(IEvent $event): array {
 		];
 	}
 
-	protected function setSubjects(IEvent $event, string $subject, array $parameters): void {
+	protected function setSubjects(IEvent $event, string $subject, array $parameters) {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
 			$placeholders[] = '{' . $placeholder . '}';

lib/AnnouncementSchedulerJob.php

@@ -40,9 +40,6 @@ public function __construct(
 		$this->setInterval(60);
 	}
 
-	/**
-	 * @return void
-	 */
 	protected function run($argument) {
 		$this->asp->doCron($argument);
 	}

lib/Migration/AnnouncementsGroupsLinks.php

@@ -54,12 +54,8 @@ public function getName(): string {
 	 * Must throw exception on error.
 	 *
 	 * @since 9.1.0
-	 *
 	 * @param IOutput $output
-	 *
 	 * @throws \Exception in case of failure
-	 *
-	 * @return void
 	 */
 	public function run(IOutput $output) {
 		$queryInsert = $this->connection->getQueryBuilder();

lib/Model/Announcement.php

@@ -128,7 +128,7 @@ public function propertyToColumn($property): string {
 	/**
 	 * @param array $groups a list of groups
 	 */
-	public function setGroupsEncode($groups): void {
+	public function setGroupsEncode($groups) {
 		// encode groups as a single string for the database
 		$this->setGroups(json_encode($groups));
 	}

lib/Service/AnnouncementSchedulerProcessor.php

@@ -46,15 +46,15 @@ public function __construct(AnnouncementMapper $mapper, Manager $manager, ITimeF
 		$this->logger = $logger;
 	}
 
-	public function doCron($argument): void {
+	public function doCron($argument) {
 		$this->logger->debug('Started announcement scheduler');
 		//first schedule then delete because e-mails might be send
 		$this->scheduleAnnouncements($argument);
 		$this->deleteAnnouncements($argument);
 		$this->logger->debug('Finished announcement scheduler');
 	}
 
-	private function scheduleAnnouncements($argument): void {
+	private function scheduleAnnouncements($argument) {
 		$scheduledAnnouncements = $this->mapper->getAnnouncementsScheduled();
 		foreach ($scheduledAnnouncements as $ann) {
 			if ($ann->getScheduleTime() > $this->timeFactory->getTime()) {
@@ -66,7 +66,7 @@ private function scheduleAnnouncements($argument): void {
 		}
 	}
 
-	private function deleteAnnouncements($argument): void {
+	private function deleteAnnouncements($argument) {
 		$deleteAnnouncements = $this->mapper->getAnnouncementsScheduledDelete();
 		foreach ($deleteAnnouncements as $ann) {
 			// don't delete unannounced announcements

src/Components/Announcement.vue

@@ -45,10 +45,6 @@
 
 					<template v-if="isAdmin">
 						·
-						<template v-if="isScheduled">
-							{{ scheduledLabel }}
-							·
-						</template>
 						<template v-if="isVisibleToEveryone">
 							{{ visibilityLabel }}
 						</template>

src/banner.js

@@ -23,9 +23,9 @@ Vue.mixin({
 	},
 })
 
-// Inject maintenance banner
+//
 /**
- *
+ * Injects a banner div into the document body in order to attach a Vue element to it
  */
 function injectBanner() {
 	if (document.body) {