chore: remove deprecations

AOEpeople · Oct 7, 2024 · 7e4b713 · 7e4b713
1 parent 00780aa
commit 7e4b713
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 52 deletions.
diff --git a/Classes/Domain/Service/RestrictionService.php b/Classes/Domain/Service/RestrictionService.php
@@ -127,7 +127,7 @@ public function hasEntry(): bool
     public function getEntry(): ?Entry
     {
         if (!isset($this->entry)) {
-            $entry = $this->entryRepository->findOneByIdentifier($this->getClientIdentifier());
+            $entry = $this->entryRepository->findOneBy(['identifier' => $this->getClientIdentifier()]);
             if ($entry instanceof Entry) {
                 $this->entry = $entry;
                 if ($this->isOutdated($entry)) {

diff --git a/Tests/Fixtures/Classes/EntryRepositoryMock.php b/Tests/Fixtures/Classes/EntryRepositoryMock.php
diff --git a/Tests/Functional/Domain/Service/RestrictionServiceClientIpAbstract.php b/Tests/Functional/Domain/Service/RestrictionServiceClientIpAbstract.php
@@ -33,7 +33,6 @@
 use Aoe\FeloginBruteforceProtection\Domain\Service\RestrictionService;
 use Aoe\FeloginBruteforceProtection\Service\Logger\Logger;
 use Aoe\FeloginBruteforceProtection\System\Configuration;
-use Aoe\FeloginBruteforceProtection\Tests\Fixtures\Classes\EntryRepositoryMock;
 use PHPUnit\Framework\MockObject\MockObject;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
@@ -139,13 +138,13 @@ public function testIsNotClientRestrictedWhenMaximumNumbersOfFailureNotReached()
             ->willReturn(time() - 200);
 
         $entryRepository = $this->getAccessibleMock(
-            EntryRepositoryMock::class,
-            ['findOneByIdentifier', 'remove'],
+            EntryRepository::class,
+            ['findOneBy', 'remove'],
             [],
             '',
             false
         );
-        $entryRepository->method('findOneByIdentifier')
+        $entryRepository->method('findOneBy')
             ->willReturn($entry);
 
         GeneralUtility::setSingletonInstance(EntryRepository::class, $entryRepository);
@@ -178,13 +177,13 @@ public function testIsClientRestrictedWithFailures(): void
             ->willReturn(time() - 400);
 
         $entryRepository = $this->getAccessibleMock(
-            EntryRepositoryMock::class,
-            ['findOneByIdentifier', 'remove'],
+            EntryRepository::class,
+            ['findOneBy', 'remove'],
             [],
             '',
             false
         );
-        $entryRepository->method('findOneByIdentifier')
+        $entryRepository->method('findOneBy')
             ->willReturn($entry);
 
         GeneralUtility::setSingletonInstance(EntryRepository::class, $entryRepository);
@@ -216,13 +215,13 @@ public function testIsClientRestrictedWithFailuresAndTimeout(): void
             ->willReturn(time() - 4000);
 
         $entryRepository = $this->getAccessibleMock(
-            EntryRepositoryMock::class,
-            ['findOneByIdentifier', 'remove'],
+            EntryRepository::class,
+            ['findOneBy', 'remove'],
             [],
             '',
             false
         );
-        $entryRepository->method('findOneByIdentifier')
+        $entryRepository->method('findOneBy')
             ->willReturn($entry);
 
         GeneralUtility::setSingletonInstance(EntryRepository::class, $entryRepository);
@@ -254,13 +253,13 @@ public function testIsClientRestrictedWithLessFailures(): void
             ->willReturn(time() - 400);
 
         $entryRepository = $this->getAccessibleMock(
-            EntryRepositoryMock::class,
-            ['findOneByIdentifier', 'remove'],
+            EntryRepository::class,
+            ['findOneBy', 'remove'],
             [],
             '',
             false
         );
-        $entryRepository->method('findOneByIdentifier')
+        $entryRepository->method('findOneBy')
             ->willReturn($entry);
 
         GeneralUtility::setSingletonInstance(EntryRepository::class, $entryRepository);

diff --git a/Tests/Functional/Domain/Service/RestrictionServiceFrontendNameAbstract.php b/Tests/Functional/Domain/Service/RestrictionServiceFrontendNameAbstract.php
@@ -33,7 +33,6 @@
 use Aoe\FeloginBruteforceProtection\Domain\Service\RestrictionService;
 use Aoe\FeloginBruteforceProtection\Service\Logger\Logger;
 use Aoe\FeloginBruteforceProtection\System\Configuration;
-use Aoe\FeloginBruteforceProtection\Tests\Fixtures\Classes\EntryRepositoryMock;
 use PHPUnit\Framework\MockObject\MockObject;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
@@ -123,8 +122,8 @@ public function testIsClientRestricted(): void
             ->willReturn(3000);
 
         $entryRepository = $this->getAccessibleMock(
-            EntryRepositoryMock::class,
-            ['findOneByIdentifier', 'remove'],
+            EntryRepository::class,
+            ['findOneBy', 'remove'],
             [],
             '',
             false
@@ -135,7 +134,7 @@ public function testIsClientRestricted(): void
             ->willReturn(0);
         $entry->method('getCrdate')
             ->willReturn(time() - 400);
-        $entryRepository->method('findOneByIdentifier')
+        $entryRepository->method('findOneBy')
             ->willReturn($entry);
 
         GeneralUtility::setSingletonInstance(EntryRepository::class, $entryRepository);
@@ -163,13 +162,13 @@ public function testIsClientRestrictedWithFailures(): void
         $entry->method('getTstamp')
             ->willReturn(time() - 400);
         $entryRepository = $this->getAccessibleMock(
-            EntryRepositoryMock::class,
-            ['findOneByIdentifier', 'remove'],
+            EntryRepository::class,
+            ['findOneBy', 'remove'],
             [],
             '',
             false
         );
-        $entryRepository->method('findOneByIdentifier')
+        $entryRepository->method('findOneBy')
             ->willReturn($entry);
 
         GeneralUtility::setSingletonInstance(EntryRepository::class, $entryRepository);
@@ -197,13 +196,13 @@ public function testIsClientRestrictedWithFailuresAndTimeout(): void
         $entry->method('getTstamp')
             ->willReturn(time() - 4000);
         $entryRepository = $this->getAccessibleMock(
-            EntryRepositoryMock::class,
-            ['findOneByIdentifier', 'remove'],
+            EntryRepository::class,
+            ['findOneBy', 'remove'],
             [],
             '',
             false
         );
-        $entryRepository->method('findOneByIdentifier')
+        $entryRepository->method('findOneBy')
             ->willReturn($entry);
 
         GeneralUtility::setSingletonInstance(EntryRepository::class, $entryRepository);
@@ -231,13 +230,13 @@ public function testIsClientRestrictedWithLessFailures(): void
         $entry->method('getTstamp')
             ->willReturn(time() - 400);
         $entryRepository = $this->getAccessibleMock(
-            EntryRepositoryMock::class,
-            ['findOneByIdentifier', 'remove'],
+            EntryRepository::class,
+            ['findOneBy', 'remove'],
             [],
             '',
             false
         );
-        $entryRepository->method('findOneByIdentifier')
+        $entryRepository->method('findOneBy')
             ->willReturn($entry);
 
         GeneralUtility::setSingletonInstance(EntryRepository::class, $entryRepository);

diff --git a/code-quality/phpstan-baseline.neon b/code-quality/phpstan-baseline.neon
@@ -1,9 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^On passing a constant, the method should have an enum type\\. See https\\://phpstan\\.org/writing\\-php\\-code/phpdoc\\-types\\#literals\\-and\\-constants$#"
-			count: 3
-			path: ../Classes/Command/CleanUpCommand.php
 
 		-
 			message: "#^Class Aoe\\\\FeloginBruteforceProtection\\\\Domain\\\\Repository\\\\Entry extends generic class TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Repository but does not specify its types\\: T$#"
@@ -80,11 +76,6 @@ parameters:
 			count: 1
 			path: ../Classes/Domain/Service/RestrictionIdentifierFrontendName.php
 
-		-
-			message: "#^Call to an undefined method Aoe\\\\FeloginBruteforceProtection\\\\Domain\\\\Repository\\\\EntryRepository\\:\\:findOneByIdentifier\\(\\)\\.$#"
-			count: 1
-			path: ../Classes/Domain/Service/RestrictionService.php
-
 		-
 			message: "#^Access to protected property TYPO3\\\\CMS\\\\Core\\\\Authentication\\\\AbstractUserAuthentication\\:\\:\\$loginSessionStarted\\.$#"
 			count: 1