Merge pull request #2034 from nextcloud/techdebt/noid/user-IThrottler…

…-interface-for-DI techdebt(DI): Use public IThrottler interface which exists since 25
nextcloud · Aug 28, 2023 · ac0d5d0 · ac0d5d0
2 parents f09f78c + 1c9229d
commit ac0d5d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/Sabre/PublicRootCollection.php b/lib/Sabre/PublicRootCollection.php
@@ -23,12 +23,12 @@
 
 namespace OCA\Photos\Sabre;
 
-use OC\Security\Bruteforce\Throttler;
 use OCA\Photos\Album\AlbumMapper;
 use OCA\Photos\Sabre\Album\PublicAlbumRoot;
 use OCA\Photos\Service\UserConfigService;
 use OCP\Files\IRootFolder;
 use OCP\IRequest;
+use OCP\Security\Bruteforce\IThrottler;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAVACL\AbstractPrincipalCollection;
 use Sabre\DAVACL\PrincipalBackend;
@@ -39,15 +39,15 @@ class PublicRootCollection extends AbstractPrincipalCollection {
  private IRootFolder $rootFolder;
  private UserConfigService $userConfigService;
  private IRequest $request;
- private Throttler $throttler;
+ private IThrottler $throttler;
 
  public function __construct(
  AlbumMapper $albumMapper,
  IRootFolder $rootFolder,
  PrincipalBackend\BackendInterface $principalBackend,
  UserConfigService $userConfigService,
  IRequest $request,
- Throttler $throttler
+ IThrottler $throttler
  ) {
  parent::__construct($principalBackend, 'principals/token');
 

diff --git a/psalm.xml b/psalm.xml
@@ -23,7 +23,6 @@
  <referencedClass name="OCA\DAV\Connector\Sabre\File" />
  <referencedClass name="OCA\DAV\Connector\Sabre\FilesPlugin" />
  <referencedClass name="OCA\DAV\Events\SabrePluginAuthInitEvent" />
- <referencedClass name="OC\Security\Bruteforce\Throttler" />
  <referencedClass name="OC_User" />
  </errorLevel>
  </UndefinedClass>
@@ -37,4 +36,4 @@
  </errorLevel>
  </UndefinedDocblockClass>
  </issueHandlers>
-</psalm>
+</psalm>