diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index aa1c18db772..e869eae9531 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -25,7 +25,6 @@
namespace OCA\Talk\Controller;
-use OC\Security\Bruteforce\Throttler;
use OCA\Talk\AppInfo\Application;
use OCA\Talk\Exceptions\ParticipantNotFoundException;
use OCA\Talk\Exceptions\RoomNotFoundException;
@@ -57,6 +56,7 @@
use OCP\IUser;
use OCP\IUserSession;
use OCP\Notification\IManager as INotificationManager;
+use OCP\Security\Bruteforce\IThrottler;
use Psr\Log\LoggerInterface;
class PageController extends Controller {
@@ -74,7 +74,7 @@ class PageController extends Controller {
private INotificationManager $notificationManager;
private IAppManager $appManager;
private IRootFolder $rootFolder;
- private Throttler $throttler;
+ private IThrottler $throttler;
public function __construct(string $appName,
IRequest $request,
@@ -92,7 +92,7 @@ public function __construct(string $appName,
IInitialState $initialState,
ICacheFactory $memcacheFactory,
IRootFolder $rootFolder,
- Throttler $throttler,
+ IThrottler $throttler,
Config $talkConfig,
IConfig $serverConfig) {
parent::__construct($appName, $request);
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 11ed1ee8190..49e2e7a89fb 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -28,7 +28,6 @@
namespace OCA\Talk\Controller;
use InvalidArgumentException;
-use OC\Security\Bruteforce\Throttler;
use OCA\Talk\Chat\ChatManager;
use OCA\Talk\Chat\MessageParser;
use OCA\Talk\Config;
@@ -65,6 +64,7 @@
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserManager;
+use OCP\Security\Bruteforce\IThrottler;
use OCP\User\Events\UserLiveStatusEvent;
use OCP\UserStatus\IManager as IUserStatusManager;
use OCP\UserStatus\IUserStatus;
@@ -92,7 +92,7 @@ class RoomController extends AEnvironmentAwareController {
protected IL10N $l10n;
protected IConfig $config;
protected Config $talkConfig;
- protected Throttler $throttler;
+ protected IThrottler $throttler;
protected LoggerInterface $logger;
protected array $commonReadMessages = [];
@@ -118,7 +118,7 @@ public function __construct(string $appName,
IConfig $config,
Config $talkConfig,
ICloudIdManager $cloudIdManager,
- Throttler $throttler,
+ IThrottler $throttler,
LoggerInterface $logger) {
parent::__construct($appName, $request);
$this->session = $session;
diff --git a/lib/Middleware/InjectionMiddleware.php b/lib/Middleware/InjectionMiddleware.php
index f4e60b4b629..3725af6f88b 100644
--- a/lib/Middleware/InjectionMiddleware.php
+++ b/lib/Middleware/InjectionMiddleware.php
@@ -23,7 +23,6 @@
namespace OCA\Talk\Middleware;
-use OC\Security\Bruteforce\Throttler;
use OCA\Talk\Controller\AEnvironmentAwareController;
use OCA\Talk\Exceptions\ParticipantNotFoundException;
use OCA\Talk\Exceptions\PermissionsException;
@@ -46,20 +45,21 @@
use OCP\AppFramework\OCSController;
use OCP\AppFramework\Utility\IControllerMethodReflector;
use OCP\IRequest;
+use OCP\Security\Bruteforce\IThrottler;
class InjectionMiddleware extends Middleware {
private IRequest $request;
private IControllerMethodReflector $reflector;
private TalkSession $talkSession;
private Manager $manager;
- private Throttler $throttler;
+ private IThrottler $throttler;
private ?string $userId;
public function __construct(IRequest $request,
IControllerMethodReflector $reflector,
TalkSession $talkSession,
Manager $manager,
- Throttler $throttler,
+ IThrottler $throttler,
?string $userId) {
$this->request = $request;
$this->reflector = $reflector;
diff --git a/psalm.xml b/psalm.xml
index a6c06de54bb..b82a052fbcd 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -26,7 +26,6 @@
-