chore: fix bug in createQuery constraints

AOEpeople · Sep 12, 2024 · 5de7f6e · 5de7f6e
1 parent b3c0541
commit 5de7f6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/Classes/Domain/Repository/EntryRepository.php b/Classes/Domain/Repository/EntryRepository.php
@@ -76,8 +76,8 @@ public function findEntriesToCleanUp($secondsTillReset, $maxFailures, $restricti
 
         $query->matching(
             $query->logicalOr(
-                $query->logicalAnd($constraintsRestrictedEntries),
-                $query->logicalAnd($constraintsResettableEntries)
+                $query->logicalAnd(...$constraintsRestrictedEntries),
+                $query->logicalAnd(...$constraintsResettableEntries)
             )
         );
 

diff --git a/code-quality/phpstan-baseline.neon b/code-quality/phpstan-baseline.neon
@@ -65,11 +65,6 @@ parameters:
 			count: 1
 			path: ../Classes/Domain/Repository/EntryRepository.php
 
-		-
-			message: "#^Parameter \\#1 \\.\\.\\.\\$constraints of method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryInterface\\<TYPO3\\\\CMS\\\\Extbase\\\\DomainObject\\\\DomainObjectInterface\\>\\:\\:logicalAnd\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Generic\\\\Qom\\\\ConstraintInterface, array\\<int, TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\Generic\\\\Qom\\\\ComparisonInterface\\> given\\.$#"
-			count: 2
-			path: ../Classes/Domain/Repository/EntryRepository.php
-
 		-
 			message: "#^Property Aoe\\\\FeloginBruteforceProtection\\\\Domain\\\\Service\\\\RestrictionIdentifierAbstract\\:\\:\\$identifierValue \\(string\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
@@ -100,11 +95,6 @@ parameters:
 			count: 1
 			path: ../Classes/Hooks/UserAuth/PostUserLookUp.php
 
-		-
-			message: "#^Anonymous variables in a \"\\$GLOBALS\\['TSFE'\\]\\-\\>\\.\\.\\.\" property fetch can lead to false dead property\\. Make sure the variable type is known$#"
-			count: 4
-			path: ../Classes/Service/AuthUser.php
-
 		-
 			message: "#^Property Aoe\\\\FeloginBruteforceProtection\\\\Service\\\\AuthUser\\:\\:\\$configuration \\(Aoe\\\\FeloginBruteforceProtection\\\\System\\\\Configuration\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
@@ -115,11 +105,6 @@ parameters:
 			count: 1
 			path: ../Classes/Service/AuthUser.php
 
-		-
-			message: "#^Property Aoe\\\\FeloginBruteforceProtection\\\\Service\\\\AuthUser\\:\\:\\$objectManager has unknown class TYPO3\\\\CMS\\\\Extbase\\\\Object\\\\ObjectManagerInterface as its type\\.$#"
-			count: 1
-			path: ../Classes/Service/AuthUser.php
-
 		-
 			message: "#^Property Aoe\\\\FeloginBruteforceProtection\\\\Service\\\\AuthUser\\:\\:\\$restrictionService \\(Aoe\\\\FeloginBruteforceProtection\\\\Domain\\\\Service\\\\RestrictionService\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1