Fix event dispatch calls for Symfony

apps/comments/lib/Dav/RootCollection.php

@@ -97,7 +97,7 @@ protected function initCollections() {
 		}
 
 		$event = new CommentsEntityEvent(CommentsEntityEvent::EVENT_ENTITY);
-		$this->dispatcher->dispatch(CommentsEntityEvent::EVENT_ENTITY, $event);
+		$this->dispatcher->dispatch($event, CommentsEntityEvent::EVENT_ENTITY);
 
 		$this->entityTypeCollections = [];
 		foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {

apps/dav/appinfo/v1/webdav.php

@@ -60,7 +60,7 @@
 
 // allow setup of additional auth backends
 $event = new \OCP\SabrePluginEvent($server);
-\OC::$server->getEventDispatcher()->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+\OC::$server->getEventDispatcher()->dispatch($event, 'OCA\DAV\Connector\Sabre::authInit');
 
 \Sabre\DAV\Server::$streamMultiStatus = true;
 // And off we go!

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -552,11 +552,11 @@ public function createCard($addressBookId, $cardUri, $cardData) {
 
 		if ($this->dispatcher !== null) {
 			$this->dispatcher->dispatch(
-				'\OCA\DAV\CardDAV\CardDavBackend::createCard',
 				new GenericEvent(null, [
 					'addressBookId' => $addressBookId,
 					'cardUri' => $cardUri,
-					'cardData' => $cardData])
+					'cardData' => $cardData]),
+				'\OCA\DAV\CardDAV\CardDavBackend::createCard',
 			);
 		}
 
@@ -605,11 +605,11 @@ public function updateCard($addressBookId, $cardUri, $cardData) {
 
 		if ($this->dispatcher !== null) {
 			$this->dispatcher->dispatch(
-				'\OCA\DAV\CardDAV\CardDavBackend::updateCard',
 				new GenericEvent(null, [
 					'addressBookId' => $addressBookId,
 					'cardUri' => $cardUri,
-					'cardData' => $cardData])
+					'cardData' => $cardData]),
+				'\OCA\DAV\CardDAV\CardDavBackend::updateCard'
 			);
 		}
 
@@ -639,10 +639,10 @@ public function deleteCard($addressBookId, $cardUri) {
 
 		if ($this->dispatcher !== null) {
 			$this->dispatcher->dispatch(
-				'\OCA\DAV\CardDAV\CardDavBackend::deleteCard',
 				new GenericEvent(null, [
 					'addressBookId' => $addressBookId,
-					'cardUri' => $cardUri])
+					'cardUri' => $cardUri]),
+				'\OCA\DAV\CardDAV\CardDavBackend::deleteCard'
 			);
 		}
 

apps/dav/lib/Connector/Sabre/File.php

@@ -161,10 +161,10 @@ public function put($data) {
 		$path = $this->fileView->getAbsolutePath($this->path);
 		$beforeEvent = new GenericEvent(null, ['path' => $path]);
 		if (!$this->fileView->file_exists($this->path)) {
-			\OC::$server->getEventDispatcher()->dispatch('file.beforecreate', $beforeEvent);
+			\OC::$server->getEventDispatcher()->dispatch($beforeEvent, 'file.beforecreate');
 			$newFile = true;
 		} else {
-			\OC::$server->getEventDispatcher()->dispatch('file.beforeupdate', $beforeEvent);
+			\OC::$server->getEventDispatcher()->dispatch($beforeEvent, 'file.beforeupdate');
 		}
 
 		list($partStorage) = $this->fileView->resolvePath($this->path);
@@ -311,9 +311,9 @@ public function put($data) {
 
 		$afterEvent = new GenericEvent(null, ['path' => $path]);
 		if ($newFile === true) {
-			\OC::$server->getEventDispatcher()->dispatch('file.aftercreate', $afterEvent);
+			\OC::$server->getEventDispatcher()->dispatch($afterEvent, 'file.aftercreate');
 		} else {
-			\OC::$server->getEventDispatcher()->dispatch('file.afterupdate', $afterEvent);
+			\OC::$server->getEventDispatcher()->dispatch($afterEvent, 'file.afterupdate');
 		}
 		return '"' . $this->info->getEtag() . '"';
 	}
@@ -365,7 +365,7 @@ private function emitPreHooks($exists, $path = null) {
 			]);
 			if ($run) {
 				$event->setArgument('run', $run);
-				\OC::$server->getEventDispatcher()->dispatch('file.beforeCreate', $event);
+				\OC::$server->getEventDispatcher()->dispatch($event, 'file.beforeCreate');
 				$run = $event->getArgument('run');
 			}
 		} else {
@@ -375,7 +375,7 @@ private function emitPreHooks($exists, $path = null) {
 			]);
 			if ($run) {
 				$event->setArgument('run', $run);
-				\OC::$server->getEventDispatcher()->dispatch('file.beforeUpdate', $event);
+				\OC::$server->getEventDispatcher()->dispatch($event, 'file.beforeUpdate');
 				$run = $event->getArgument('run');
 			}
 		}
@@ -385,7 +385,7 @@ private function emitPreHooks($exists, $path = null) {
 		]);
 		if ($run) {
 			$event->setArgument('run', $run);
-			\OC::$server->getEventDispatcher()->dispatch('file.beforeWrite', $event);
+			\OC::$server->getEventDispatcher()->dispatch($event, 'file.beforeWrite');
 			$run = $event->getArgument('run');
 		}
 		return $run;
@@ -545,10 +545,10 @@ private function createFileChunked($data) {
 			$beforeEvent = new GenericEvent(null, ['path' => $absPath]);
 			$newFile = false;
 			if (!$this->fileView->file_exists($targetPath)) {
-				\OC::$server->getEventDispatcher()->dispatch('file.beforecreate', $beforeEvent);
+				\OC::$server->getEventDispatcher()->dispatch($beforeEvent, 'file.beforecreate');
 				$newFile = true;
 			} else {
-				\OC::$server->getEventDispatcher()->dispatch('file.beforeupdate', $beforeEvent);
+				\OC::$server->getEventDispatcher()->dispatch($beforeEvent, 'file.beforeupdate');
 			}
 
 			/** @var \OC\Files\Storage\Storage $targetStorage */
@@ -626,9 +626,9 @@ private function createFileChunked($data) {
 				if ($etag !== null) {
 					$afterEvent = new GenericEvent(null, ['path' => $absPath]);
 					if ($newFile === true) {
-						\OC::$server->getEventDispatcher()->dispatch('file.aftercreate', $afterEvent);
+						\OC::$server->getEventDispatcher()->dispatch($afterEvent, 'file.aftercreate');
 					} else {
-						\OC::$server->getEventDispatcher()->dispatch('file.afterupdate', $afterEvent);
+						\OC::$server->getEventDispatcher()->dispatch($afterEvent, 'file.afterupdate');
 					}
 				}
 				return $etag;

apps/dav/lib/Files/Sharing/PublicLinkEventsPlugin.php

@@ -87,7 +87,7 @@ public function beforeMethod(RequestInterface $request, ResponseInterface $respo
 		 * dav.public.delete.before
 		 */
 		$eventName = "dav.public.{$lowercaseMethod}.before";
-		$this->dispatcher->dispatch($eventName, $event);
+		$this->dispatcher->dispatch($event, $eventName);
 	}
 
 	/**
@@ -128,6 +128,6 @@ public function afterMethod(RequestInterface $request, ResponseInterface $respon
 		 * dav.public.delete.after
 		 */
 		$eventName = "dav.public.{$lowercaseMethod}.after";
-		$this->dispatcher->dispatch($eventName, $event);
+		$this->dispatcher->dispatch($event, $eventName);
 	}
 }

apps/dav/lib/Server.php

@@ -145,7 +145,7 @@ public function __construct(IRequest $request, $baseUri) {
 
 		// allow setup of additional auth backends
 		$event = new SabrePluginEvent($this->server);
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+		$dispatcher->dispatch($event, 'OCA\DAV\Connector\Sabre::authInit');
 
 		// because we are throwing exceptions this plugin has to be the last one
 		$authPlugin->addBackend($authBackend);

apps/federatedfilesharing/lib/FedShareManager.php

@@ -143,7 +143,6 @@ public function createShare(
 		);
 
 		$this->eventDispatcher->dispatch(
-			'\OCA\FederatedFileSharing::remote_shareReceived',
 			new GenericEvent(
 				null,
 				[
@@ -154,7 +153,8 @@ public function createShare(
 					'sharedby' => $sharedByAddress->getUserId(),
 					'remoteid' => $remoteId
 				]
-			)
+			),
+			'\OCA\FederatedFileSharing::remote_shareReceived'
 		);
 		$this->publishActivity(
 			$shareWith,

apps/federatedfilesharing/lib/FederatedShareProvider.php

@@ -554,7 +554,7 @@ public function delete(IShare $share) {
 	 * a message that the file was unshared
 	 *
 	 * @param IShare $share
-	 * @param bool $isOwner the user can either be the owner or the user who re-sahred it
+	 * @param bool $isOwner the user can either be the owner or the user who re-shared it
 	 * @throws ShareNotFound
 	 * @throws \OC\HintException
 	 */
@@ -921,7 +921,7 @@ private function getRawShare($id) {
 	}
 
 	/**
-	 * Create a share object from an database row
+	 * Create a share object from a database row
 	 *
 	 * @param array $data
 	 * @return IShare
@@ -1153,8 +1153,8 @@ public function addShare($remote, $token, $name, $owner, $shareWith, $remoteId)
 	 */
 	public function getAccepted($remote, $shareWith) {
 		$event = $this->eventDispatcher->dispatch(
-			'remoteshare.received',
-			new GenericEvent('', ['remote' => $remote])
+			new GenericEvent('', ['remote' => $remote]),
+			'remoteshare.received'
 		);
 		'@phan-var GenericEvent $event';
 		if ($event->getArgument('autoAddServers')) {

apps/federation/lib/TrustedServers.php

@@ -167,7 +167,7 @@ public function removeServer($id) {
 		$server = $this->dbHandler->getServerById($id);
 		$this->dbHandler->removeServer($id);
 		$event = new GenericEvent($server['url_hash']);
-		$this->dispatcher->dispatch('OCP\Federation\TrustedServerEvent::remove', $event);
+		$this->dispatcher->dispatch($event, 'OCP\Federation\TrustedServerEvent::remove');
 	}
 
 	/**

apps/files/download.php

@@ -41,7 +41,7 @@
 
 //Dispatch an event to see if any apps have problem with download
 $event = new \Symfony\Component\EventDispatcher\GenericEvent(null, ['path' => $filename]);
-OC::$server->getEventDispatcher()->dispatch('file.beforeGetDirect', $event);
+OC::$server->getEventDispatcher()->dispatch($event, 'file.beforeGetDirect');
 if ($event->hasArgument('errorMessage')) {
 	\http_response_code(403);
 	$tmpl = new OCP\Template('', '403', 'guest');

apps/files/lib/Controller/ViewController.php

@@ -300,7 +300,7 @@ public function showFile($fileId, $details = null) {
 				'resolvedWebLink' => null,
 				'resolvedDavLink' => null,
 			]);
-			$this->eventDispatcher->dispatch('files.resolvePrivateLink', $event);
+			$this->eventDispatcher->dispatch($event, 'files.resolvePrivateLink');
 
 			$webUrl = $event->getArgument('resolvedWebLink');
 			$webdavUrl = $event->getArgument('resolvedDavLink');

apps/files_sharing/lib/Controller/Share20OcsController.php

@@ -256,7 +256,7 @@ protected function formatShare(IShare $share, $received = false) {
 			$result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
 		} elseif ($share->getShareType() === Share::SHARE_TYPE_LINK) {
 			if ($share->getPassword() !== null) {
-				// Misleading names ahead!: This fields are miss-used to
+				// Misleading names ahead!: These fields are miss-used to
 				// read/write public link password-hashes
 				$result['share_with'] = '***redacted***';
 				$result['share_with_displayname'] = '***redacted***';
@@ -307,7 +307,7 @@ public function getShare($id) {
 				$share = $this->formatShare($share);
 				return new Result([$share]);
 			} catch (NotFoundException $e) {
-				//Fall trough
+				//Fall through
 			} catch (StorageNotAvailableException $e) {
 				// could happen if the share node points to a storage which isn't available
 				// TODO: This should go through an injected logger instance
@@ -453,7 +453,7 @@ public function createShare() {
 				return new Result(null, 404, $this->l->t('Please specify a valid user'));
 			}
 
-			// Fetch the UID to match exactly with the user (case sensitive).
+			// Fetch the UID to match exactly with the user (case-sensitive).
 			$share->setSharedWith($user->getUID());
 			$share->setPermissions($permissions);
 			if ($userAutoAccept) {
@@ -1018,7 +1018,7 @@ private function updateShareState($id, $state) {
 
 		try {
 			$share = $this->getShareById($id, $this->userSession->getUser()->getUID());
-			$this->eventDispatcher->dispatch('share.before' . $eventName, new GenericEvent(null, ['share' => $share]));
+			$this->eventDispatcher->dispatch(new GenericEvent(null, ['share' => $share]), 'share.before' . $eventName);
 		} catch (ShareNotFound $e) {
 			return new Result(null, 404, $this->l->t('Wrong share ID, share doesn\'t exist'));
 		}
@@ -1041,7 +1041,7 @@ private function updateShareState($id, $state) {
 
 		if ($share->getState() === $state) {
 			if ($eventName !== '') {
-				$this->eventDispatcher->dispatch('share.after' . $eventName, new GenericEvent(null, ['share' => $share]));
+				$this->eventDispatcher->dispatch(new GenericEvent(null, ['share' => $share]), 'share.after' . $eventName);
 			}
 			// if there are no changes in the state, just return the share as if the change was successful
 			$node->unlock(ILockingProvider::LOCK_SHARED);
@@ -1084,7 +1084,7 @@ private function updateShareState($id, $state) {
 		$this->notificationPublisher->discardNotificationForUser($share, $this->userSession->getUser()->getUID());
 
 		if ($eventName !== '') {
-			$this->eventDispatcher->dispatch('share.after' . $eventName, new GenericEvent(null, ['share' => $share]));
+			$this->eventDispatcher->dispatch(new GenericEvent(null, ['share' => $share]), 'share.after' . $eventName);
 		}
 		return new Result([$this->formatShare($share, true)]);
 	}

apps/files_sharing/lib/Controllers/ExternalSharesController.php

@@ -105,7 +105,7 @@ public function create($id) {
 					'shareRecipient' => $shareInfo['user'],
 				]
 			);
-			$this->dispatcher->dispatch('remoteshare.accepted', $event);
+			$this->dispatcher->dispatch($event, 'remoteshare.accepted');
 			$this->externalManager->acceptShare($id);
 		}
 		return new JSONResponse();
@@ -130,7 +130,7 @@ public function destroy($id) {
 					'remoteUrl' => $shareInfo['remote']
 				]
 			);
-			$this->dispatcher->dispatch('remoteshare.declined', $event);
+			$this->dispatcher->dispatch($event, 'remoteshare.declined');
 			$this->externalManager->declineShare($id);
 		}
 		return new JSONResponse();

apps/files_sharing/lib/Controllers/ShareController.php

@@ -192,7 +192,7 @@ public function authenticate($token, $password = '') {
 	 */
 	private function linkShareAuth(\OCP\Share\IShare $share, $password = null) {
 		$beforeEvent = new GenericEvent(null, ['shareObject' => $share]);
-		$this->eventDispatcher->dispatch('share.beforelinkauth', $beforeEvent);
+		$this->eventDispatcher->dispatch($beforeEvent, 'share.beforelinkauth');
 		if ($password !== null) {
 			if ($this->shareManager->checkPassword($share, $password)) {
 				$this->session->set('public_link_authenticated', (string)$share->getId());
@@ -208,7 +208,7 @@ private function linkShareAuth(\OCP\Share\IShare $share, $password = null) {
 			}
 		}
 		$afterEvent = new GenericEvent(null, ['shareObject' => $share]);
-		$this->eventDispatcher->dispatch('share.afterlinkauth', $afterEvent);
+		$this->eventDispatcher->dispatch($afterEvent, 'share.afterlinkauth');
 		return true;
 	}
 
@@ -253,7 +253,7 @@ protected function emitAccessShareHook($share, $errorCode = 200, $errorMessage =
 				['shareObject' => $cloneShare, 'errorCode' => $errorCode,
 					'errorMessage' => $errorMessage]
 			);
-			$this->eventDispatcher->dispatch('share.linkaccess', $publicShareLinkAccessEvent);
+			$this->eventDispatcher->dispatch($publicShareLinkAccessEvent, 'share.linkaccess');
 		}
 
 		if ($exception !== null) {