Merge pull request #18256 from nextcloud/files-aditional-scripts-new-events

Use non-depricated events for loading additional scripts in files app

3 files changed, 6 insertions, 3 deletions

diff --git a/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php b/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php
index ab8299bd632..76be9aa1a7a 100644
--- a/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php
+++ b/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php
@@ -30,7 +30,7 @@ use OC\EventDispatcher\SymfonyAdapter;
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
-use Symfony\Component\EventDispatcher\GenericEvent;
+use OCP\EventDispatcher\GenericEvent;
 
 class LegacyLoadAdditionalScriptsAdapter implements IEventListener {
 
diff --git a/apps/files_external/lib/Service/BackendService.php b/apps/files_external/lib/Service/BackendService.php
index 3b3ccf20264..fd2e25ff672 100644
--- a/apps/files_external/lib/Service/BackendService.php
+++ b/apps/files_external/lib/Service/BackendService.php
@@ -31,6 +31,7 @@ use OCA\Files_External\Lib\Auth\AuthMechanism;
 use OCA\Files_External\Lib\Backend\Backend;
 use OCA\Files_External\Lib\Config\IAuthMechanismProvider;
 use OCA\Files_External\Lib\Config\IBackendProvider;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IConfig;
 
 /**
@@ -111,7 +112,8 @@ class BackendService {
 		static $eventSent = false;
 		if(!$eventSent) {
 			\OC::$server->getEventDispatcher()->dispatch(
-				'OCA\\Files_External::loadAdditionalBackends'
+				'OCA\\Files_External::loadAdditionalBackends',
+				new GenericEvent()
 			);
 			$eventSent = true;
 		}
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index 9dd399f2dcd..df0dd16bf43 100644
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -22,6 +22,7 @@
  */
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\Files\Event\LoadSidebar;
+use OCP\EventDispatcher\GenericEvent;
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
@@ -38,7 +39,7 @@ $tmpl = new OCP\Template('files_sharing', 'list', '');
 $tmpl->assign('showgridview', $showgridview && !$isIE);
 
 // fire script events
-$eventDispatcher->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts');
+$eventDispatcher->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts', new GenericEvent());
 $eventDispatcher->dispatch(LoadAdditionalScriptsEvent::class, new LoadAdditionalScriptsEvent());
 $eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar());