diff --git a/composer.json b/composer.json
index d5cd3b7d3..d0c747e29 100644
--- a/composer.json
+++ b/composer.json
@@ -79,12 +79,13 @@
         "contribute": [
             "@fix-rector",
             "@fix-style",
-            "@analyze"
+            "@analyze",
+            "@phpstan-generate-baseline"
         ],
         "check-style": "@php vendor/bin/ecs check --ansi",
         "fix-style": "@php vendor/bin/ecs check --fix --ansi",
         "analyze": "@php vendor/bin/phpstan analyse --memory-limit=-1 --ansi",
-        "phpstan-generate-baseline": "@php vendor/bin/phpstan analyse --generate-baseline --memory-limit=-1 --ansi",
+        "phpstan-generate-baseline": "@php vendor/bin/phpstan analyse --generate-baseline --memory-limit=-1 --ansi --allow-empty-baseline",
         "test": "@php vendor/bin/phpunit",
         "docs": "@php vendor/bin/rule-doc-generator generate src --output-file docs/all_rectors_overview.md --ansi",
         "rector": "@php vendor/bin/rector process --dry-run --ansi",
diff --git a/config/v12/typo3-120.php b/config/v12/typo3-120.php
index 41920e859..efa9482d9 100644
--- a/config/v12/typo3-120.php
+++ b/config/v12/typo3-120.php
@@ -12,6 +12,7 @@
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\AddMethodToWidgetInterfaceClassesRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\ChangeExtbaseValidatorsRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\ContentObjectRegistrationViaServiceConfigurationRector;
+use Ssch\TYPO3Rector\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\HintNecessaryUploadedFileChangesRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\ImplementSiteLanguageAwareInterfaceRector;
 use Ssch\TYPO3Rector\Rector\v12\v0\typo3\MigrateQueryBuilderExecuteRector;
@@ -170,4 +171,5 @@
     $rectorConfig->rule(RegisterExtbaseTypeConvertersAsServicesRector::class);
     $rectorConfig->rule(ChangeExtbaseValidatorsRector::class);
     $rectorConfig->rule(ContentObjectRegistrationViaServiceConfigurationRector::class);
+    $rectorConfig->rule(HardenMethodSignatureOfLogicalAndAndLogicalOrRector::class);
 };
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 000000000..aab499115
--- /dev/null
+++ b/phpstan-baseline.neon
@@ -0,0 +1,2 @@
+parameters:
+	ignoreErrors: []
diff --git a/phpstan.neon b/phpstan.neon
index 293cd903b..aa40dd203 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,4 +1,5 @@
 includes:
+    - phpstan-baseline.neon
     # see https://github.com/symplify/phpstan-extensions
     - utils/phpstan/config/typo3-rector.neon
 
@@ -33,11 +34,19 @@ parameters:
          - tests/bootstrap-phpstan.php
 
     inferPrivatePropertyTypeFromConstructor: true
-    reportUnmatchedIgnoredErrors: true
+    reportUnmatchedIgnoredErrors: false
 
     ignoreErrors:
         # node finder
         - '#Method Ssch\\TYPO3Rector\\Rector\\v11\\v0\\ForwardResponseInsteadOfForwardMethodRector\:\:extractForwardMethodCalls\(\) should return array<PhpParser\\Node\\Expr\\MethodCall\> but returns array<PhpParser\\Node\>#'
+        - "#\\:\\:getRuleDefinition\\(\\) has invalid return type Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\RuleDefinition\\.$#"
+        - "#^Instantiated class Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\CodeSample\\\\CodeSample not found\\.$#"
+        - "#^Instantiated class Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\RuleDefinition not found\\.$#"
+
+        # These 3 rules are not found for some strange reasons in GitHub Actions but locally they are reported
+        - "#\\:\\:getRuleDefinition\\(\\) has invalid return type Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\RuleDefinition\\.$#"
+        - "#^Instantiated class Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\CodeSample\\\\CodeSample not found\\.$#"
+        - "#^Instantiated class Symplify\\\\RuleDocGenerator\\\\ValueObject\\\\RuleDefinition not found\\.$#"
 
         # waits for Rector and PHPStan to share same php-parser, probably with PHPStan 1.0
         - '#PhpParser\\Node\\Arg\|PhpParser\\Node\\VariadicPlaceholder#'
diff --git a/src/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector.php b/src/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector.php
new file mode 100644
index 000000000..4355ca2ed
--- /dev/null
+++ b/src/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector.php
@@ -0,0 +1,349 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ssch\TYPO3Rector\Rector\v12\v0\typo3;
+
+use PhpParser\Node;
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr\Array_;
+use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\BinaryOp;
+use PhpParser\Node\Expr\BinaryOp\GreaterOrEqual;
+use PhpParser\Node\Expr\BinaryOp\Identical;
+use PhpParser\Node\Expr\BooleanNot;
+use PhpParser\Node\Expr\Empty_;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Stmt;
+use PhpParser\Node\Stmt\ElseIf_;
+use PhpParser\Node\Stmt\Expression;
+use PhpParser\Node\Stmt\If_;
+use PHPStan\Type\ObjectType;
+use Rector\Core\Rector\AbstractRector;
+use Rector\PostRector\Collector\NodesToAddCollector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @changelog https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/12.0/Breaking-96044-HardenMethodSignatureOfLogicalAndAndLogicalOr.html
+ * @see \Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\HardenMethodSignatureOfLogicalAndAndLogicalOrRectorTest
+ */
+final class HardenMethodSignatureOfLogicalAndAndLogicalOrRector extends AbstractRector
+{
+    /**
+     * @readonly
+     */
+    public NodesToAddCollector $nodesToAddCollector;
+
+    public function __construct(NodesToAddCollector $nodesToAddCollector)
+    {
+        $this->nodesToAddCollector = $nodesToAddCollector;
+    }
+
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [MethodCall::class];
+    }
+
+    /**
+     * @param MethodCall $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if (! $this->nodeTypeResolver->isMethodStaticCallOrClassMethodObjectType(
+            $node,
+            new ObjectType('TYPO3\CMS\Extbase\Persistence\QueryInterface')
+        )) {
+            return null;
+        }
+
+        if (! $this->isNames($node->name, ['logicalAnd', 'logicalOr'])) {
+            return null;
+        }
+
+        $args = $node->getArgs();
+        if (! isset($args[0])) {
+            return null;
+        }
+
+        if (count($args) > 1) {
+            return null;
+        }
+
+        $firstArgument = $args[0]->value;
+
+        if ($firstArgument instanceof Variable) {
+            // In this case, the code looks like this: $query->logicalAnd($constraints);
+            return $this->handleArgumentIsVariable($node, $firstArgument);
+        }
+
+        if (! ($firstArgument instanceof Array_)) {
+            return null;
+        }
+
+        // In this case, the code looks like this: $query->logicalAnd([...])
+
+        // Maybe add "new \PhpParser\Node\Stmt\Nop()" somehow for long lines?
+        $node->args = $this->nodeFactory->createArgs([...$firstArgument->items]);
+
+        return $node;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Use multiple parameters instead of array for logicalOr and logicalAnd of Extbase Query class',
+            [
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalAnd extends Repository
+{
+    public function findAllForList()
+    {
+        $query = $this->createQuery();
+        $query->matching($query->logicalAnd([
+            $query->equals('propertyName1', 'value1'),
+            $query->equals('propertyName2', 'value2'),
+            $query->equals('propertyName3', 'value3'),
+        ]));
+    }
+    public function findAllForSomething()
+    {
+        $query = $this->createQuery();
+        $constraints[] = $query->lessThan('foo', 1);
+        $constraints[] = $query->lessThan('bar', 1);
+        $query->matching($query->logicalAnd($constraints));
+    }
+}
+CODE_SAMPLE
+                    ,
+                    <<<'CODE_SAMPLE'
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalAnd extends Repository
+{
+    public function findAllForList()
+    {
+        $query = $this->createQuery();
+        $query->matching($query->logicalAnd(
+            $query->equals('propertyName1', 'value1'),
+            $query->equals('propertyName2', 'value2'),
+            $query->equals('propertyName3', 'value3'),
+        ));
+    }
+    public function findAllForSomething()
+    {
+        $query = $this->createQuery();
+        $constraints[] = $query->lessThan('foo', 1);
+        $constraints[] = $query->lessThan('bar', 1);
+        $query->matching($query->logicalAnd(...$constraints));
+    }
+}
+CODE_SAMPLE
+                ),
+            ]
+        );
+    }
+
+    private function handleArgumentIsVariable(MethodCall $node, Variable $firstArgument): ?MethodCall
+    {
+        $parentIfStatement = $this->betterNodeFinder->findParentType($node, If_::class);
+
+        $currentStmt = $this->betterNodeFinder->resolveCurrentStatement($node);
+        if (! $currentStmt instanceof Stmt) {
+            return null;
+        }
+
+        $parentNode = $node->getAttribute('parent');
+
+        $logicalAndOrOr = $this->isName($node->name, 'logicalAnd') ? 'logicalAnd' : 'logicalOr';
+
+        $queryVariable = $node->var instanceof Variable ? $node->var : new Variable('query');
+
+        if ($parentNode instanceof Assign && $parentNode->expr instanceof MethodCall) {
+            // FIXME: This case is quite complicated as we don't really know how the code looks like. This is WIP for now...
+            // This is how a real world example could look like. See: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72244/8/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php
+            // $constraints = [];
+            // $query = $this->createQuery();
+            // $query->setOrderings(['userName' => QueryInterface::ORDER_ASCENDING]);
+            // // Username
+            // if ($demand->getUserName() !== '') {
+            //     $searchConstraints = [];
+            //     $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('be_users');
+            //     foreach (['userName', 'realName'] as $field) {
+            //         $searchConstraints[] = $query->like(
+            //             $field,
+            //             '%' . $queryBuilder->escapeLikeWildcards($demand->getUserName()) . '%'
+            //         );
+            //     }
+            //     if (MathUtility::canBeInterpretedAsInteger($demand->getUserName())) {
+            //         $searchConstraints[] = $query->equals('uid', (int)$demand->getUserName());
+            //     }
+            //     $constraints[] = $query->logicalOr($searchConstraints);
+            // }
+            $if = $this->createIfForAssignment($parentNode, $firstArgument);
+        } else {
+            $if = $this->createIfForNormalMethod($firstArgument, $queryVariable, $logicalAndOrOr);
+        }
+
+        if (! ($parentIfStatement instanceof If_)) {
+            $this->nodesToAddCollector->addNodeBeforeNode($if, $node);
+            return $node;
+        }
+
+        if ($this->isBinaryOpAndNameAppearsInConditions($parentIfStatement, $firstArgument)
+            || $this->isBooleanNotAndNameAppears($parentIfStatement, $firstArgument)
+            || $this->isEmptyAndNameAppears($parentIfStatement, $firstArgument)
+            || $this->isVariableAndNameAppears($parentIfStatement, $firstArgument)
+        ) {
+            $this->removeNode($parentIfStatement);
+            $this->nodesToAddCollector->addNodeBeforeNode($if, $parentIfStatement);
+        } else {
+            #$this->removeNode($node);
+            $this->nodesToAddCollector->addNodeBeforeNode($if, $node);
+        }
+
+        return $node;
+    }
+
+    private function createIfForAssignment(Assign $parentNode, Variable $firstArgument): If_
+    {
+        $ifExpression = clone $parentNode;
+        $ifExpression->expr = $this->nodeFactory->createFuncCall('reset', [$firstArgument]);
+
+        return new If_(
+            new Identical($this->nodeFactory->createFuncCall('count', [$firstArgument]), new LNumber(1)),
+            [
+                'stmts' => [$ifExpression],
+                'elseifs' => [
+                    new ElseIf_(
+                        new GreaterOrEqual(
+                            $this->nodeFactory->createFuncCall('count', [$firstArgument]),
+                            new LNumber(2)
+                        ),
+                        [new Expression($parentNode->expr)]
+                    ),
+                ],
+            ]
+        );
+    }
+
+    private function createIfForNormalMethod(
+        Variable $firstArgument,
+        Variable $queryVariable,
+        string $logicalAndOrOr
+    ): If_ {
+        return new If_(
+            new Identical($this->nodeFactory->createFuncCall('count', [$firstArgument]), new LNumber(1)),
+            [
+                'stmts' => [
+                    new Expression(
+                        $this->nodeFactory->createMethodCall(
+                            $queryVariable,
+                            'matching',
+                            [new Arg($this->nodeFactory->createFuncCall('reset', [$firstArgument]))]
+                        )
+                    ),
+                ],
+                'elseifs' => [
+                    new ElseIf_(
+                        new GreaterOrEqual(
+                            $this->nodeFactory->createFuncCall('count', [$firstArgument]),
+                            new LNumber(2)
+                        ),
+                        [
+                            new Expression(
+                                $this->nodeFactory->createMethodCall(
+                                    $queryVariable,
+                                    'matching',
+                                    [
+                                        new Arg(
+                                            $this->nodeFactory->createMethodCall(
+                                                $queryVariable,
+                                                $logicalAndOrOr,
+                                                [new Arg($firstArgument, false, true)]
+                                            ),
+                                        ),
+                                    ]
+                                )
+                            ),
+                        ]
+                    ),
+                ],
+            ]
+        );
+    }
+
+    private function isBinaryOpAndNameAppearsInConditions(If_ $parentIfStatement, Variable $firstArgument): bool
+    {
+        if (! ($parentIfStatement->cond instanceof BinaryOp)) {
+            return false;
+        }
+
+        /** @var string $name */
+        $name = $firstArgument->name;
+
+        return ($parentIfStatement->cond->left instanceof Variable && $this->isName(
+            $parentIfStatement->cond->left,
+            $name
+        ))
+            || ($parentIfStatement->cond->right instanceof Variable && $this->isName(
+                $parentIfStatement->cond->right,
+                $name
+            ));
+    }
+
+    private function isBooleanNotAndNameAppears(If_ $parentIfStatement, Variable $firstArgument): bool
+    {
+        if (! ($parentIfStatement->cond instanceof BooleanNot)) {
+            return false;
+        }
+
+        /** @var string $name */
+        $name = $firstArgument->name;
+
+        if ($parentIfStatement->cond->expr instanceof Variable) {
+            return $this->isName($parentIfStatement->cond->expr, $name);
+        }
+
+        if ($parentIfStatement->cond->expr instanceof Empty_) {
+            return $this->isName($parentIfStatement->cond->expr->expr, $name);
+        }
+
+        return false;
+    }
+
+    private function isEmptyAndNameAppears(If_ $parentIfStatement, Variable $firstArgument): bool
+    {
+        if (! ($parentIfStatement->cond instanceof Empty_)) {
+            return false;
+        }
+
+        /** @var string $name */
+        $name = $firstArgument->name;
+
+        return $this->isName($parentIfStatement->cond->expr, $name);
+    }
+
+    private function isVariableAndNameAppears(If_ $parentIfStatement, Variable $firstArgument): bool
+    {
+        if (! ($parentIfStatement->cond instanceof Variable)) {
+            return false;
+        }
+
+        /** @var string $name */
+        $name = $firstArgument->name;
+
+        return $this->isName($parentIfStatement->cond, $name);
+    }
+}
diff --git a/stubs/TYPO3/CMS/Extbase/Domain/Model/Constraint.php b/stubs/TYPO3/CMS/Extbase/Domain/Model/Constraint.php
new file mode 100644
index 000000000..73f1c27e0
--- /dev/null
+++ b/stubs/TYPO3/CMS/Extbase/Domain/Model/Constraint.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
+class Constraint
+{
+    public function getStartTimestamp(): int
+    {
+        return 1;
+    }
+
+    public function getEndTimestamp(): int
+    {
+        return 2;
+    }
+
+    public function getNumber(): int
+    {
+        return 42;
+    }
+}
diff --git a/stubs/TYPO3/CMS/Extbase/Domain/Model/Demand.php b/stubs/TYPO3/CMS/Extbase/Domain/Model/Demand.php
new file mode 100644
index 000000000..84923c31a
--- /dev/null
+++ b/stubs/TYPO3/CMS/Extbase/Domain/Model/Demand.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TYPO3\CMS\Extbase\Domain\Model;
+
+class Demand
+{
+
+    public function getUserName()
+    {
+    }
+
+    public function getBackendUserGroup()
+    {
+    }
+}
diff --git a/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Qom/AndInterface.php b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Qom/AndInterface.php
new file mode 100644
index 000000000..98cf270b1
--- /dev/null
+++ b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Qom/AndInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TYPO3\CMS\Extbase\Persistence\Generic\Qom;
+
+if (interface_exists('TYPO3\CMS\Extbase\Persistence\Generic\Qom\AndInterface')) {
+    return;
+}
+
+interface AndInterface extends ConstraintInterface
+{
+
+}
diff --git a/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Qom/ConstraintInterface.php b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Qom/ConstraintInterface.php
new file mode 100644
index 000000000..618218398
--- /dev/null
+++ b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Qom/ConstraintInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TYPO3\CMS\Extbase\Persistence\Generic\Qom;
+
+if (interface_exists('TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface')) {
+    return;
+}
+
+interface ConstraintInterface
+{
+
+}
diff --git a/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Qom/OrInterface.php b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Qom/OrInterface.php
new file mode 100644
index 000000000..31e52f411
--- /dev/null
+++ b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Qom/OrInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TYPO3\CMS\Extbase\Persistence\Generic\Qom;
+
+if (interface_exists('TYPO3\CMS\Extbase\Persistence\Generic\Qom\OrInterface')) {
+    return;
+}
+
+interface OrInterface extends ConstraintInterface
+{
+
+}
diff --git a/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Query.php b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Query.php
index 3daa926ee..106a21c90 100644
--- a/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Query.php
+++ b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/Query.php
@@ -1,10 +1,14 @@
 <?php
-declare(strict_types=1);
 
+declare(strict_types=1);
 
 namespace TYPO3\CMS\Extbase\Persistence\Generic;
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Qom\AndInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\Qom\OrInterface;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 
 if (class_exists('TYPO3\CMS\Extbase\Persistence\Generic\Query')) {
     return;
@@ -12,12 +16,119 @@
 
 final class Query implements QueryInterface
 {
+    /**
+     * @param bool $returnRawQueryResult
+     * @return QueryResultInterface|object[]
+     */
+    public function execute($returnRawQueryResult = false)
+    {
+    }
+
+    public function setOrderings(array $orderings)
+    {
+    }
+
+    public function setLimit($limit)
+    {
+    }
+
+    public function setOffset($offset)
+    {
+    }
+
+    public function matching($constraint)
+    {
+    }
+
+    /**
+     * @param ConstraintInterface ...$constraints
+     * @return AndInterface
+     */
+    public function logicalAnd(ConstraintInterface ...$constraints)
+    {
+    }
+
+    /**
+     * @param ConstraintInterface ...$constraints
+     * @return OrInterface
+     */
+    public function logicalOr(ConstraintInterface ...$constraints)
+    {
+    }
+
+    public function logicalNot(ConstraintInterface $constraint)
+    {
+    }
+
+    public function equals($propertyName, $operand, $caseSensitive = true)
+    {
+    }
+
+    public function like($propertyName, $operand)
+    {
+    }
+
+    public function contains($propertyName, $operand)
+    {
+    }
+
+    public function in($propertyName, $operand)
+    {
+    }
+
+    public function lessThan($propertyName, $operand)
+    {
+    }
+
+    public function lessThanOrEqual($propertyName, $operand)
+    {
+    }
+
+    public function greaterThan($propertyName, $operand)
+    {
+    }
+
+    public function greaterThanOrEqual($propertyName, $operand)
+    {
+    }
+
+    public function setType(string $type): void
+    {
+    }
+
+    public function getType()
+    {
+    }
+
+    public function setQuerySettings(QuerySettingsInterface $querySettings)
+    {
+    }
+
+    public function getQuerySettings()
+    {
+    }
+
+    public function count()
+    {
+    }
+
+    public function getOrderings()
+    {
+    }
+
+    public function getLimit()
+    {
+    }
+
+    public function getOffset()
+    {
+    }
 
-    public function logicalAnd($constraint1)
+    public function getConstraint()
     {
     }
 
-    public function logicalOr($constraint1)
+    public function getStatement()
     {
     }
 }
diff --git a/stubs/TYPO3/CMS/Extbase/Persistence/Generic/QuerySettingsInterface.php b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/QuerySettingsInterface.php
new file mode 100644
index 000000000..ad22ce3ca
--- /dev/null
+++ b/stubs/TYPO3/CMS/Extbase/Persistence/Generic/QuerySettingsInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TYPO3\CMS\Extbase\Persistence\Generic;
+
+interface QuerySettingsInterface
+{
+
+}
diff --git a/stubs/TYPO3/CMS/Extbase/Persistence/QueryInterface.php b/stubs/TYPO3/CMS/Extbase/Persistence/QueryInterface.php
index 50cbc318a..d834a4a1e 100644
--- a/stubs/TYPO3/CMS/Extbase/Persistence/QueryInterface.php
+++ b/stubs/TYPO3/CMS/Extbase/Persistence/QueryInterface.php
@@ -1,16 +1,112 @@
 <?php
-declare(strict_types=1);
 
+declare(strict_types=1);
 
 namespace TYPO3\CMS\Extbase\Persistence;
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Qom\AndInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\Qom\OrInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface;
+
 if (interface_exists('TYPO3\CMS\Extbase\Persistence\QueryInterface')) {
     return;
 }
 
 interface QueryInterface
 {
-    public function logicalAnd($constraint1);
+    public const OPERATOR_EQUAL_TO = 1;
+
+    public const OPERATOR_EQUAL_TO_NULL = 101;
+
+    public const OPERATOR_NOT_EQUAL_TO = 2;
+
+    public const OPERATOR_NOT_EQUAL_TO_NULL = 202;
+
+    public const OPERATOR_LESS_THAN = 3;
+
+    public const OPERATOR_LESS_THAN_OR_EQUAL_TO = 4;
+
+    public const OPERATOR_GREATER_THAN = 5;
+
+    public const OPERATOR_GREATER_THAN_OR_EQUAL_TO = 6;
+
+    public const OPERATOR_LIKE = 7;
+
+    public const OPERATOR_CONTAINS = 8;
+
+    public const OPERATOR_IN = 9;
+
+    public const OPERATOR_IS_NULL = 10;
+
+    public const OPERATOR_IS_EMPTY = 11;
+
+    public const ORDER_ASCENDING = 'ASC';
+    public const ORDER_DESCENDING = 'DESC';
+
+    /**
+     * Executes the query and returns the result.
+     *
+     * @param bool $returnRawQueryResult
+     * @return QueryResultInterface|object[]
+     */
+    public function execute($returnRawQueryResult = false);
+
+    public function setOrderings(array $orderings);
+
+    public function setLimit($limit);
+
+    public function setOffset($offset);
+
+    public function matching($constraint);
+
+    /**
+     * @param ConstraintInterface ...$constraints
+     * @return AndInterface
+     */
+    public function logicalAnd(ConstraintInterface ...$constraints);
+
+    /**
+     * @param ConstraintInterface ...$constraints
+     * @return OrInterface
+     */
+    public function logicalOr(ConstraintInterface ...$constraints);
+
+    public function logicalNot(ConstraintInterface $constraint);
+
+    public function equals($propertyName, $operand, $caseSensitive = true);
+
+    public function like($propertyName, $operand);
+
+    public function contains($propertyName, $operand);
+
+    public function in($propertyName, $operand);
+
+    public function lessThan($propertyName, $operand);
+
+    public function lessThanOrEqual($propertyName, $operand);
+
+    public function greaterThan($propertyName, $operand);
+
+    public function greaterThanOrEqual($propertyName, $operand);
+
+    public function setType(string $type): void;
+
+    public function getType();
+
+    public function setQuerySettings(QuerySettingsInterface $querySettings);
+
+    public function getQuerySettings();
+
+    public function count();
+
+    public function getOrderings();
+
+    public function getLimit();
+
+    public function getOffset();
+
+    public function getConstraint();
 
-    public function logicalOr($constraint1);
+    public function getStatement();
 }
diff --git a/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/fixture.php.inc b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/fixture.php.inc
new file mode 100644
index 000000000..97a482ccd
--- /dev/null
+++ b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/fixture.php.inc
@@ -0,0 +1,40 @@
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixtur;
+
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalAnd extends Repository
+{
+    public function findAllForList()
+    {
+        $query = $this->createQuery();
+        $query->matching(
+            $query->logicalAnd([
+                $query->lessThan('foo', 1),
+                $query->lessThan('bar', 1)
+            ])
+        );
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixtur;
+
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalAnd extends Repository
+{
+    public function findAllForList()
+    {
+        $query = $this->createQuery();
+        $query->matching(
+            $query->logicalAnd($query->lessThan('foo', 1), $query->lessThan('bar', 1))
+        );
+    }
+}
+
+?>
diff --git a/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/log_entry_repository.php.inc b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/log_entry_repository.php.inc
new file mode 100644
index 000000000..7d16555ce
--- /dev/null
+++ b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/log_entry_repository.php.inc
@@ -0,0 +1,105 @@
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixture;
+
+use TYPO3\CMS\Extbase\Domain\Model\Constraint;
+use TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class LogEntryRepository extends Repository
+{
+    public function findByConstraintWithNotEmptyComparison(Constraint $constraint): QueryResultInterface
+    {
+        $query = $this->createQuery();
+        $queryConstraints = $this->createQueryConstraints($query, $constraint);
+        if (!empty($queryConstraints)) {
+            $query->matching($query->logicalAnd($queryConstraints));
+        }
+        $query->setOrderings(['uid' => QueryInterface::ORDER_DESCENDING]);
+        $query->setLimit($constraint->getNumber());
+        return $query->execute();
+    }
+
+    public function findByConstraintWithVariableComparison(Constraint $constraint): QueryResultInterface
+    {
+        $query = $this->createQuery();
+        $queryConstraints = $this->createQueryConstraints($query, $constraint);
+        if ($queryConstraints) {
+            $query->matching($query->logicalAnd($queryConstraints));
+        }
+        $query->setOrderings(['uid' => QueryInterface::ORDER_DESCENDING]);
+        $query->setLimit($constraint->getNumber());
+        return $query->execute();
+    }
+
+    /**
+     * @param QueryInterface $query
+     * @param Constraint $constraint
+     * @return ConstraintInterface[]
+     */
+    protected function createQueryConstraints(QueryInterface $query, Constraint $constraint): array
+    {
+        $queryConstraints = [];
+        $queryConstraints[] = $query->greaterThanOrEqual('tstamp', $constraint->getStartTimestamp());
+        $queryConstraints[] = $query->lessThan('tstamp', $constraint->getEndTimestamp());
+        return $queryConstraints;
+    }
+}
+?>
+-----
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixture;
+
+use TYPO3\CMS\Extbase\Domain\Model\Constraint;
+use TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class LogEntryRepository extends Repository
+{
+    public function findByConstraintWithNotEmptyComparison(Constraint $constraint): QueryResultInterface
+    {
+        $query = $this->createQuery();
+        $queryConstraints = $this->createQueryConstraints($query, $constraint);
+        if (count($queryConstraints) === 1) {
+            $query->matching(reset($queryConstraints));
+        } elseif (count($queryConstraints) >= 2) {
+            $query->matching($query->logicalAnd(...$queryConstraints));
+        }
+        $query->setOrderings(['uid' => QueryInterface::ORDER_DESCENDING]);
+        $query->setLimit($constraint->getNumber());
+        return $query->execute();
+    }
+
+    public function findByConstraintWithVariableComparison(Constraint $constraint): QueryResultInterface
+    {
+        $query = $this->createQuery();
+        $queryConstraints = $this->createQueryConstraints($query, $constraint);
+        if (count($queryConstraints) === 1) {
+            $query->matching(reset($queryConstraints));
+        } elseif (count($queryConstraints) >= 2) {
+            $query->matching($query->logicalAnd(...$queryConstraints));
+        }
+        $query->setOrderings(['uid' => QueryInterface::ORDER_DESCENDING]);
+        $query->setLimit($constraint->getNumber());
+        return $query->execute();
+    }
+
+    /**
+     * @param QueryInterface $query
+     * @param Constraint $constraint
+     * @return ConstraintInterface[]
+     */
+    protected function createQueryConstraints(QueryInterface $query, Constraint $constraint): array
+    {
+        $queryConstraints = [];
+        $queryConstraints[] = $query->greaterThanOrEqual('tstamp', $constraint->getStartTimestamp());
+        $queryConstraints[] = $query->lessThan('tstamp', $constraint->getEndTimestamp());
+        return $queryConstraints;
+    }
+}
+?>
diff --git a/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_and_with_individual_arguments.php.inc b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_and_with_individual_arguments.php.inc
new file mode 100644
index 000000000..a130405c1
--- /dev/null
+++ b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_and_with_individual_arguments.php.inc
@@ -0,0 +1,18 @@
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixtur;
+
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalAndButAsIndividualArguments extends Repository
+{
+    public function findAllForList()
+    {
+        $query = $this->createQuery();
+        $query->matching(
+            $query->logicalAnd($query->lessThan('foo', 1), $query->lessThan('bar', 1))
+        );
+    }
+}
+
+?>
diff --git a/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_and_with_one_individual_argument.php.inc b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_and_with_one_individual_argument.php.inc
new file mode 100644
index 000000000..2d4d65ffe
--- /dev/null
+++ b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_and_with_one_individual_argument.php.inc
@@ -0,0 +1,18 @@
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixtur;
+
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalAndButOneIndividualArgument extends Repository
+{
+    public function findAllForList()
+    {
+        $query = $this->createQuery();
+        $query->matching(
+            $query->logicalAnd($query->lessThan('foo', 1))
+        );
+    }
+}
+
+?>
diff --git a/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_and_with_variables_as_arguments.php.inc b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_and_with_variables_as_arguments.php.inc
new file mode 100644
index 000000000..d052f775e
--- /dev/null
+++ b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_and_with_variables_as_arguments.php.inc
@@ -0,0 +1,81 @@
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixtur;
+
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalAndWithConstraintsAsArguments extends Repository
+{
+    public function findAllForList()
+    {
+        $constraints = [];
+        $query = $this->createQuery();
+        if ($constraints !== []) {
+            $query->matching($query->logicalAnd(...$constraints));
+        }
+    }
+
+    public function findAllForListWithDifferentQueryVariableName()
+    {
+        $constraints = [];
+        $q = $this->createQuery();
+        if ($constraints !== []) {
+            $q->matching($q->logicalAnd(...$constraints));
+        }
+    }
+
+    public function findAllForListWithLogicalOr()
+    {
+        $constraints = [];
+        $q = $this->createQuery();
+        if ($constraints !== []) {
+            $q->matching($q->logicalOr(...$constraints));
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixtur;
+
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalAndWithConstraintsAsArguments extends Repository
+{
+    public function findAllForList()
+    {
+        $constraints = [];
+        $query = $this->createQuery();
+        if (count($constraints) === 1) {
+            $query->matching(reset($constraints));
+        } elseif (count($constraints) >= 2) {
+            $query->matching($query->logicalAnd(...$constraints));
+        }
+    }
+
+    public function findAllForListWithDifferentQueryVariableName()
+    {
+        $constraints = [];
+        $q = $this->createQuery();
+        if (count($constraints) === 1) {
+            $q->matching(reset($constraints));
+        } elseif (count($constraints) >= 2) {
+            $q->matching($q->logicalAnd(...$constraints));
+        }
+    }
+
+    public function findAllForListWithLogicalOr()
+    {
+        $constraints = [];
+        $q = $this->createQuery();
+        if (count($constraints) === 1) {
+            $q->matching(reset($constraints));
+        } elseif (count($constraints) >= 2) {
+            $q->matching($q->logicalOr(...$constraints));
+        }
+    }
+}
+
+?>
diff --git a/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_or.php.inc b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_or.php.inc
new file mode 100644
index 000000000..9aa1cc7fc
--- /dev/null
+++ b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/Fixture/query_logical_or.php.inc
@@ -0,0 +1,40 @@
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixtur;
+
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalOr extends Repository
+{
+    public function findAllForList()
+    {
+        $query = $this->createQuery();
+        $query->matching(
+            $query->logicalOr([
+                $query->lessThan('foo', 1),
+                $query->lessThan('bar', 1),
+            ])
+        );
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector\Fixtur;
+
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+class ProductRepositoryLogicalOr extends Repository
+{
+    public function findAllForList()
+    {
+        $query = $this->createQuery();
+        $query->matching(
+            $query->logicalOr($query->lessThan('foo', 1), $query->lessThan('bar', 1))
+        );
+    }
+}
+
+?>
diff --git a/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/HardenMethodSignatureOfLogicalAndAndLogicalOrRectorTest.php b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/HardenMethodSignatureOfLogicalAndAndLogicalOrRectorTest.php
new file mode 100644
index 000000000..304ab4e55
--- /dev/null
+++ b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/HardenMethodSignatureOfLogicalAndAndLogicalOrRectorTest.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class HardenMethodSignatureOfLogicalAndAndLogicalOrRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    /**
+     * @return Iterator<array<string>>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/config/configured_rule.php b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/config/configured_rule.php
new file mode 100644
index 000000000..ba0bb42cc
--- /dev/null
+++ b/tests/Rector/v12/v0/typo3/HardenMethodSignatureOfLogicalAndAndLogicalOrRector/config/configured_rule.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Ssch\TYPO3Rector\Rector\v12\v0\typo3\HardenMethodSignatureOfLogicalAndAndLogicalOrRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->import(__DIR__ . '/../../../../../../../config/config_test.php');
+    $rectorConfig->rule(HardenMethodSignatureOfLogicalAndAndLogicalOrRector::class);
+};
diff --git a/tests/Rector/v9/v0/QueryLogicalOrAndLogicalAndToArrayParameterRector/Fixture/query_logical_and_with_array_but_additional_parameter.php.inc b/tests/Rector/v9/v0/QueryLogicalOrAndLogicalAndToArrayParameterRector/Fixture/query_logical_and_with_array_but_additional_parameter.php.inc
index 1b648f525..14c52ee84 100644
--- a/tests/Rector/v9/v0/QueryLogicalOrAndLogicalAndToArrayParameterRector/Fixture/query_logical_and_with_array_but_additional_parameter.php.inc
+++ b/tests/Rector/v9/v0/QueryLogicalOrAndLogicalAndToArrayParameterRector/Fixture/query_logical_and_with_array_but_additional_parameter.php.inc
@@ -33,7 +33,7 @@ class ProductRepositoryLogicalAndButArrayAndAdditionalParameter extends Reposito
         $query->matching($query->logicalAnd([
                 $query->lessThan('foo', 1),
                 $query->lessThan('bar', 1),
-            ]
+            ], 'foo'
         ));
     }
 }