Public API's GenericEvent replacement

apps/admin_audit/lib/AppInfo/Application.php

@@ -43,12 +43,12 @@
 use OCP\AppFramework\App;
 use OCP\Authentication\TwoFactorAuth\IProvider;
 use OCP\Console\ConsoleEvent;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IGroupManager;
 use OCP\ILogger;
 use OCP\IPreview;
 use OCP\IUserSession;
 use OCP\Util;
-use Symfony\Component\EventDispatcher\GenericEvent;
 use OCP\Share;
 
 class Application extends App {

apps/dav/appinfo/app.php

@@ -25,7 +25,7 @@
 
 use OCA\DAV\AppInfo\Application;
 use OCA\DAV\CardDAV\CardDavBackend;
-use Symfony\Component\EventDispatcher\GenericEvent;
+use OCP\EventDispatcher\GenericEvent;
 
 \OC_App::loadApps(['dav']);
 

apps/dav/lib/AppInfo/Application.php

@@ -42,11 +42,11 @@
 use OCA\DAV\CardDAV\PhotoCache;
 use OCA\DAV\CardDAV\SyncService;
 use OCA\DAV\HookManager;
-use \OCP\AppFramework\App;
+use OCP\AppFramework\App;
 use OCP\Contacts\IManager as IContactsManager;
 use OCP\Calendar\IManager as ICalendarManager;
 use OCP\IUser;
-use Symfony\Component\EventDispatcher\GenericEvent;
+use OCP\EventDispatcher\GenericEvent;
 
 class Application extends App {
 

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -38,6 +38,7 @@
 use OCA\DAV\Connector\Sabre\Principal;
 use OCA\DAV\DAV\Sharing\Backend;
 use OCP\IDBConnection;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IGroupManager;
 use OCP\ILogger;
 use OCP\IUser;
@@ -64,7 +65,6 @@
 use Sabre\VObject\Recur\EventIterator;
 use Sabre\Uri;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Class CalDavBackend

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -37,6 +37,7 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCA\DAV\DAV\Sharing\Backend;
 use OCA\DAV\DAV\Sharing\IShareable;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUser;
@@ -49,7 +50,6 @@
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Reader;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class CardDavBackend implements BackendInterface, SyncSupport {
 

apps/dav/tests/unit/CardDAV/CardDavBackendTest.php

@@ -38,8 +38,8 @@
 use OCA\DAV\Connector\Sabre\Principal;
 use OCP\App\IAppManager;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\IConfig;
 use OCP\IDBConnection;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IGroupManager;
 use OCP\IL10N;
 use OCP\IUserManager;
@@ -50,7 +50,6 @@
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Property\Text;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 use Test\TestCase;
 
 /**

apps/federation/lib/TrustedServers.php

@@ -32,12 +32,12 @@
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\Security\ISecureRandom;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class TrustedServers {
 

apps/federation/tests/TrustedServersTest.php

@@ -33,6 +33,7 @@
 use OCA\Federation\TrustedServers;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 use OCP\Http\Client\IResponse;
@@ -221,8 +222,8 @@ public function testRemoveServer() {
 			->willReturnCallback(
 				function($eventId, $event) {
 					$this->assertSame($eventId, 'OCP\Federation\TrustedServerEvent::remove');
-					$this->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
-					/** @var \Symfony\Component\EventDispatcher\GenericEvent $event */
+					$this->assertInstanceOf(GenericEvent::class, $event);
+					/** @var GenericEvent $event */
 					$this->assertSame('url_hash', $event->getSubject());
 				}
 			);

apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php

@@ -28,7 +28,7 @@
 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 {
 

apps/files/lib/Service/TagService.php

@@ -27,12 +27,12 @@
 use OC\Tags;
 use OCA\Files\Activity\FavoriteProvider;
 use OCP\Activity\IManager;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\Files\Folder;
 use OCP\ITags;
 use OCP\IUser;
 use OCP\IUserSession;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Service class to manage tags on files.

apps/files_sharing/lib/Controller/ShareController.php

@@ -63,7 +63,7 @@
 use OCP\Files\IRootFolder;
 use OCP\Share\Exceptions\ShareNotFound;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\Share\IManager as ShareManager;
 
 /**

apps/lookup_server_connector/lib/AppInfo/Application.php

@@ -24,7 +24,7 @@
 use OCA\LookupServerConnector\UpdateLookupServer;
 use OCP\AppFramework\App;
 use OCP\IUser;
-use Symfony\Component\EventDispatcher\GenericEvent;
+use OCP\EventDispatcher\GenericEvent;
 
 class Application extends App {
 	public function __construct () {

apps/settings/lib/AppInfo/Application.php

@@ -46,14 +46,14 @@
 use OCP\Activity\IManager as IActivityManager;
 use OCP\AppFramework\App;
 use OCP\Defaults;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IContainer;
 use OCP\IGroup;
 use OCP\ILogger;
 use OCP\IUser;
 use OCP\Settings\IManager;
 use OCP\Util;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
 

apps/settings/lib/Controller/CheckSetupController.php

@@ -48,6 +48,7 @@
 use OCP\AppFramework\Http\DataDisplayResponse;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\RedirectResponse;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
 use OCP\IDateTimeFormatter;
@@ -59,7 +60,6 @@
 use OCP\Lock\ILockingProvider;
 use OCP\Security\ISecureRandom;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class CheckSetupController extends Controller {
 	/** @var IConfig */

apps/workflowengine/lib/AppInfo/Application.php

@@ -23,12 +23,12 @@
 
 use OCA\WorkflowEngine\Manager;
 use OCP\AppFramework\QueryException;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\Template;
 use OCA\WorkflowEngine\Controller\RequestTime;
 use OCP\WorkflowEngine\IEntity;
 use OCP\WorkflowEngine\IOperation;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends \OCP\AppFramework\App {
 

apps/workflowengine/lib/Entity/File.php

@@ -24,14 +24,14 @@
 
 namespace OCA\WorkflowEngine\Entity;
 
+use OCP\EventDispatcher\GenericEvent;
 use OCP\Files\IRootFolder;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\SystemTag\MapperEvent;
 use OCP\WorkflowEngine\GenericEntityEvent;
 use OCP\WorkflowEngine\IEntity;
 use OCP\WorkflowEngine\IRuleMatcher;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class File implements IEntity {
 

apps/workflowengine/lib/Manager.php

@@ -39,6 +39,7 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Files\Storage\IStorage;
 use OCP\IDBConnection;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\IServerContainer;
@@ -51,7 +52,6 @@
 use OCP\WorkflowEngine\IOperation;
 use OCP\WorkflowEngine\IRuleMatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Manager implements IManager {
 

core/Application.php

@@ -38,11 +38,10 @@
 use OC\DB\MissingIndexInformation;
 use OC\DB\SchemaWrapper;
 use OCP\AppFramework\App;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
-use OCP\IServerContainer;
 use OCP\Util;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Class Application

core/Command/Db/AddMissingIndices.php

@@ -24,12 +24,12 @@
 namespace OC\Core\Command\Db;
 
 use OC\DB\SchemaWrapper;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IDBConnection;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Class AddMissingIndices

core/Command/Maintenance/Repair.php

@@ -28,14 +28,14 @@
 
 use Exception;
 use OCP\App\IAppManager;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IConfig;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Repair extends Command {
 	/** @var \OC\Repair $repair */

core/Command/Upgrade.php

@@ -37,14 +37,14 @@
 use OC\Console\TimestampFormatter;
 use OC\Installer;
 use OC\Updater;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\Util;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Upgrade extends Command {
 

core/Controller/AppPasswordController.php

@@ -32,11 +32,11 @@
 use OCP\Authentication\Exceptions\CredentialsUnavailableException;
 use OCP\Authentication\Exceptions\PasswordUnavailableException;
 use OCP\Authentication\LoginCredentials\IStore;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\Security\ISecureRandom;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class AppPasswordController extends \OCP\AppFramework\OCSController {
 
@@ -121,6 +121,7 @@ public function getAppPassword(): DataResponse {
 	 * @NoAdminRequired
 	 *
 	 * @return DataResponse
+	 * @throws OCSForbiddenException
 	 */
 	public function deleteAppPassword() {
 		if (!$this->session->exists('app_password')) {
@@ -141,6 +142,7 @@ public function deleteAppPassword() {
 
 	/**
 	 * @NoAdminRequired
+	 * @throws OCSForbiddenException
 	 */
 	public function rotateAppPassword(): DataResponse {
 		if (!$this->session->exists('app_password')) {

core/Controller/ClientFlowLoginController.php

@@ -33,11 +33,13 @@
 use OCA\OAuth2\Db\AccessToken;
 use OCA\OAuth2\Db\AccessTokenMapper;
 use OCA\OAuth2\Db\ClientMapper;
+use OCA\OAuth2\Exceptions\ClientNotFoundException;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\StandaloneTemplateResponse;
 use OCP\Defaults;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\ISession;
@@ -47,7 +49,6 @@
 use OCP\Security\ISecureRandom;
 use OCP\Session\Exceptions\SessionNotAvailableException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 class ClientFlowLoginController extends Controller {
 	/** @var IUserSession */
@@ -161,6 +162,7 @@ private function stateTokenForbiddenResponse() {
 	 * @param string $clientIdentifier
 	 *
 	 * @return StandaloneTemplateResponse
+	 * @throws ClientNotFoundException
 	 */
 	public function showAuthPickerPage($clientIdentifier = '') {
 		$clientName = $this->getClientName();
@@ -230,6 +232,7 @@ public function showAuthPickerPage($clientIdentifier = '') {
 	 * @param string $stateToken
 	 * @param string $clientIdentifier
 	 * @return StandaloneTemplateResponse
+	 * @throws ClientNotFoundException
 	 */
 	public function grantPage($stateToken = '',
 								 $clientIdentifier = '') {
@@ -277,6 +280,7 @@ public function grantPage($stateToken = '',
 	 * @param string $stateToken
 	 * @param string $clientIdentifier
 	 * @return Http\RedirectResponse|Response
+	 * @throws ClientNotFoundException
 	 */
 	public function generateAppPassword($stateToken,
 										$clientIdentifier = '') {