Skip to content

Commit 081545a

Browse files
committed
[ci-review] Rector Rectify
1 parent ff54c41 commit 081545a

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

rules/CodeQuality/Rector/BooleanAnd/RepeatedAndNotEqualToNotInArrayRector.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
use PhpParser\Node\Arg;
99
use PhpParser\Node\Expr;
1010
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
11-
use PhpParser\Node\Expr\BinaryOp\Equal;
12-
use PhpParser\Node\Expr\BinaryOp\Identical;
1311
use PhpParser\Node\Expr\BinaryOp\NotEqual;
1412
use PhpParser\Node\Expr\BinaryOp\NotIdentical;
1513
use PhpParser\Node\Expr\BooleanNot;
@@ -181,19 +179,15 @@ private function matchComparedAndDesiredValues(BooleanAnd $booleanAnd): ?array
181179
return array_reverse($comparedExprAndValueExprs);
182180
}
183181

184-
private function isStrictComparison(BooleanAnd $node): bool
182+
private function isStrictComparison(BooleanAnd $booleanAnd): bool
185183
{
186-
$notIenticals = $this->betterNodeFinder->findInstanceOf($node, NotIdentical::class);
187-
$notEquals = $this->betterNodeFinder->findInstanceOf($node, NotEqual::class);
184+
$notIenticals = $this->betterNodeFinder->findInstanceOf($booleanAnd, NotIdentical::class);
185+
$notEquals = $this->betterNodeFinder->findInstanceOf($booleanAnd, NotEqual::class);
188186

189187
if ($notIenticals !== []) {
190-
if ($notEquals !== []) {
191-
// mix identical and equals, keep as is
192-
// @see https://3v4l.org/24cFl
193-
return false;
194-
}
195-
196-
return true;
188+
// mix identical and equals, keep as is
189+
// @see https://3v4l.org/24cFl
190+
return $notEquals === [];
197191
}
198192

199193
return false;

rules/Privatization/NodeManipulator/VisibilityManipulator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private function replaceVisibilityFlag(ClassMethod | Property | ClassConst | Par
207207
$this->makeNonStatic($node);
208208
}
209209

210-
if ($visibility !== Visibility::STATIC && $visibility !== Visibility::ABSTRACT && $visibility !== Visibility::FINAL) {
210+
if (!in_array($visibility, [Visibility::STATIC, Visibility::ABSTRACT, Visibility::FINAL], true)) {
211211
$this->removeVisibility($node);
212212
}
213213

src/ValueObject/Error/SystemError.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function getRectorClass(): ?string
8383
public function getRectorShortClass(): ?string
8484
{
8585
$rectorClass = $this->rectorClass;
86-
if ($rectorClass !== null && $rectorClass !== '' && $rectorClass !== '0') {
86+
if (!in_array($rectorClass, [null, '', '0'], true)) {
8787
return (string) Strings::after($rectorClass, '\\', -1);
8888
}
8989

0 commit comments

Comments
 (0)