Skip to content

Drop IEventListener template parameter #37506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
provokateurin wants to merge 1 commit into from
Closed

Drop IEventListener template parameter #37506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions apps/dav/lib/Listener/CalendarDeletionDefaultUpdaterListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
use Throwable;
use function strpos;

/**
* @template-implements IEventListener<\OCA\DAV\Events\CalendarDeletedEvent>
*/
class CalendarDeletionDefaultUpdaterListener implements IEventListener {

/** @var IConfig */
Expand Down
3 changes: 0 additions & 3 deletions apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
use OCP\IUserSession;
use Psr\Log\LoggerInterface;

/**
* @template-implements IEventListener<\OC\Authentication\Events\AppPasswordCreatedEvent>
*/
class AppPasswordCreatedActivityListener implements IEventListener {
/** @var IActivityManager */
private $activityManager;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/Accounts/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
use OCP\User\Events\UserChangedEvent;
use Psr\Log\LoggerInterface;

/**
* @template-implements IEventListener<UserChangedEvent>
*/
class Hooks implements IEventListener {
/** @var IAccountManager */
private $accountManager;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/Authentication/Listeners/LoginFailedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
use OCP\IUserManager;
use OCP\Util;

/**
* @template-implements IEventListener<\OC\Authentication\Events\LoginFailed>
*/
class LoginFailedListener implements IEventListener {
/** @var IEventDispatcher */
private $dispatcher;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/Authentication/Listeners/RemoteWipeActivityListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
use OCP\EventDispatcher\IEventListener;
use Psr\Log\LoggerInterface;

/**
* @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent>
*/
class RemoteWipeActivityListener implements IEventListener {
/** @var IActvityManager */
private $activityManager;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/Authentication/Listeners/RemoteWipeEmailListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@
use Psr\Log\LoggerInterface;
use function substr;

/**
* @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent>
*/
class RemoteWipeEmailListener implements IEventListener {
/** @var IMailer */
private $mailer;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
use OCP\EventDispatcher\IEventListener;
use OCP\Notification\IManager as INotificationManager;

/**
* @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent>
*/
class RemoteWipeNotificationsListener implements IEventListener {
/** @var INotificationManager */
private $notificationManager;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
use OCP\EventDispatcher\IEventListener;
use OCP\User\Events\UserDeletedEvent;

/**
* @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent>
*/
class UserDeletedStoreCleanupListener implements IEventListener {
/** @var Registry */
private $registry;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
use Psr\Log\LoggerInterface;
use Throwable;

/**
* @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent>
*/
class UserDeletedTokenCleanupListener implements IEventListener {
/** @var Manager */
private $manager;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/Authentication/Listeners/UserLoggedInListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
use OCP\EventDispatcher\IEventListener;
use OCP\User\Events\PostLoginEvent;

/**
* @template-implements IEventListener<\OCP\User\Events\PostLoginEvent>
*/
class UserLoggedInListener implements IEventListener {
/** @var Manager */
private $manager;
Expand Down
1 change: 0 additions & 1 deletion lib/private/Collaboration/Reference/File/FileReferenceEventListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
use OCP\Share\Events\ShareCreatedEvent;
use OCP\Share\Events\ShareDeletedEvent;

/** @template-implements IEventListener<Event|NodeDeletedEvent|ShareDeletedEvent|ShareCreatedEvent> */
class FileReferenceEventListener implements IEventListener {
private IReferenceManager $manager;

Expand Down
1 change: 0 additions & 1 deletion lib/private/Collaboration/Reference/RenderReferenceEventListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
use OCP\EventDispatcher\IEventListener;
use OCP\IInitialStateService;

/** @template-implements IEventListener<Event|RenderReferenceEvent> */
class RenderReferenceEventListener implements IEventListener {
private IReferenceManager $manager;
private IInitialStateService $initialStateService;
Expand Down
5 changes: 0 additions & 5 deletions lib/private/Metadata/FileEventListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@
use OCP\Files\FileInfo;
use Psr\Log\LoggerInterface;

/**
* @template-implements IEventListener<NodeRemovedFromCache>
* @template-implements IEventListener<NodeDeletedEvent>
* @template-implements IEventListener<NodeWrittenEvent>
*/
class FileEventListener implements IEventListener {
private IMetadataManager $manager;
private LoggerInterface $logger;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/Share20/UserRemovedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
use OCP\Group\Events\UserRemovedEvent;
use OCP\Share\IManager;

/**
* @template-implements IEventListener<UserRemovedEvent>
*/
class UserRemovedListener implements IEventListener {
/** @var IManager */
protected $shareManager;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/TagManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
use OCP\Db\Exception as DBException;
use Psr\Log\LoggerInterface;

/**
* @template-implements IEventListener<UserDeletedEvent>
*/
class TagManager implements ITagManager, IEventListener {
private TagMapper $mapper;
private IUserSession $userSession;
Expand Down
3 changes: 0 additions & 3 deletions lib/private/User/Listeners/BeforeUserDeletedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
use OCP\IAvatarManager;
use Psr\Log\LoggerInterface;

/**
* @template-implements IEventListener<BeforeUserDeletedEvent>
*/
class BeforeUserDeletedListener implements IEventListener {
private IAvatarManager $avatarManager;
private LoggerInterface $logger;
Expand Down
5 changes: 1 addition & 4 deletions lib/private/User/Listeners/UserChangedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
use OCP\Files\NotFoundException;
use OCP\IAvatarManager;

/**
* @template-implements IEventListener<UserChangedEvent>
*/
class UserChangedListener implements IEventListener {
private IAvatarManager $avatarManager;

Expand All @@ -43,7 +40,7 @@ public function handle(Event $event): void {
if (!($event instanceof UserChangedEvent)) {
return;
}

$user = $event->getUser();
$feature = $event->getFeature();
$oldValue = $event->getOldValue();
Expand Down
2 changes: 1 addition & 1 deletion lib/public/EventDispatcher/IEventDispatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function removeListener(string $eventName, callable $listener): void;
* @param string $eventName preferably the fully-qualified class name of the Event sub class to listen for
* @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class to listen for
* @param string $className fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
* @psalm-param class-string<\OCP\EventDispatcher\IEventListener<T>> $className fully qualified class name that can be built by the DI container
* @psalm-param class-string<\OCP\EventDispatcher\IEventListener> $className fully qualified class name that can be built by the DI container
* @param int $priority The higher this value, the earlier an event
* listener will be triggered in the chain (defaults to 0)
*
Expand Down
3 changes: 0 additions & 3 deletions lib/public/EventDispatcher/IEventListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,10 @@

/**
* @since 17.0.0
*
* @template T of Event
*/
interface IEventListener {
/**
* @param Event $event
* @psalm-param T $event
*
* @since 17.0.0
*/
Expand Down