Skip to content

Commit b579a32

Browse files
phpstan-botphpstan-bot
committed
Merge branch 2.1.x into 2.2.x
2 parents 6474395 + 38036bf commit b579a32

77 files changed

Lines changed: 1048 additions & 201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎tests/PHPStan/Analyser/Bug9307CallMethodsRuleTest.php‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,34 @@ class Bug9307CallMethodsRuleTest extends RuleTestCase
2121
protected function getRule(): Rule
2222
{
2323
$reflectionProvider = self::createReflectionProvider();
24-
$ruleLevelHelper = new RuleLevelHelper($reflectionProvider, true, false, true, true, false, false, true);
24+
$ruleLevelHelper = new RuleLevelHelper(
25+
$reflectionProvider,
26+
checkNullables: true,
27+
checkThisOnly: false,
28+
checkUnionTypes: true,
29+
checkExplicitMixed: true,
30+
checkImplicitMixed: false,
31+
checkBenevolentUnionTypes: false,
32+
discoveringSymbolsTip: true,
33+
);
2534
return new CallMethodsRule(
26-
new MethodCallCheck($reflectionProvider, $ruleLevelHelper, true, true),
27-
new FunctionCallParametersCheck($ruleLevelHelper, new NullsafeCheck(), new UnresolvableTypeHelper(), new PropertyReflectionFinder(), $reflectionProvider, true, true, true, true),
35+
new MethodCallCheck(
36+
$reflectionProvider,
37+
$ruleLevelHelper,
38+
checkFunctionNameCase: true,
39+
reportMagicMethods: true,
40+
),
41+
new FunctionCallParametersCheck(
42+
$ruleLevelHelper,
43+
new NullsafeCheck(),
44+
new UnresolvableTypeHelper(),
45+
new PropertyReflectionFinder(),
46+
$reflectionProvider,
47+
checkArgumentTypes: true,
48+
checkArgumentsPassedByReference: true,
49+
checkExtraArguments: true,
50+
checkMissingTypehints: true,
51+
),
2852
);
2953
}
3054

‎tests/PHPStan/Rules/Arrays/ArrayDestructuringRuleTest.php‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,25 @@ class ArrayDestructuringRuleTest extends RuleTestCase
1515

1616
protected function getRule(): Rule
1717
{
18-
$ruleLevelHelper = new RuleLevelHelper(self::createReflectionProvider(), true, false, true, false, false, false, true);
18+
$ruleLevelHelper = new RuleLevelHelper(
19+
self::createReflectionProvider(),
20+
checkNullables: true,
21+
checkThisOnly: false,
22+
checkUnionTypes: true,
23+
checkExplicitMixed: false,
24+
checkImplicitMixed: false,
25+
checkBenevolentUnionTypes: false,
26+
discoveringSymbolsTip: true,
27+
);
1928

2029
return new ArrayDestructuringRule(
2130
$ruleLevelHelper,
22-
new NonexistentOffsetInArrayDimFetchCheck($ruleLevelHelper, true, false, false),
31+
new NonexistentOffsetInArrayDimFetchCheck(
32+
$ruleLevelHelper,
33+
reportMaybes: true,
34+
reportPossiblyNonexistentGeneralArrayOffset: false,
35+
reportPossiblyNonexistentConstantArrayOffset: false,
36+
),
2337
);
2438
}
2539

‎tests/PHPStan/Rules/Arrays/ArrayUnpackingRuleTest.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@ protected function getRule(): Rule
2323
{
2424
return new ArrayUnpackingRule(
2525
self::getContainer()->getByType(PhpVersion::class),
26-
new RuleLevelHelper(self::createReflectionProvider(), true, false, $this->checkUnions, false, false, $this->checkBenevolentUnions, true),
26+
new RuleLevelHelper(
27+
self::createReflectionProvider(),
28+
checkNullables: true,
29+
checkThisOnly: false,
30+
checkUnionTypes: $this->checkUnions,
31+
checkExplicitMixed: false,
32+
checkImplicitMixed: false,
33+
checkBenevolentUnionTypes: $this->checkBenevolentUnions,
34+
discoveringSymbolsTip: true,
35+
),
2736
);
2837
}
2938

‎tests/PHPStan/Rules/Arrays/InvalidKeyInArrayDimFetchRuleTest.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,16 @@ class InvalidKeyInArrayDimFetchRuleTest extends RuleTestCase
1919

2020
protected function getRule(): Rule
2121
{
22-
$ruleLevelHelper = new RuleLevelHelper(self::createReflectionProvider(), true, false, true, true, true, false, true);
22+
$ruleLevelHelper = new RuleLevelHelper(
23+
self::createReflectionProvider(),
24+
checkNullables: true,
25+
checkThisOnly: false,
26+
checkUnionTypes: true,
27+
checkExplicitMixed: true,
28+
checkImplicitMixed: true,
29+
checkBenevolentUnionTypes: false,
30+
discoveringSymbolsTip: true,
31+
);
2332
return new InvalidKeyInArrayDimFetchRule(
2433
$ruleLevelHelper,
2534
self::getContainer()->getByType(PhpVersion::class),

‎tests/PHPStan/Rules/Arrays/InvalidKeyInArrayItemRuleTest.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@ class InvalidKeyInArrayItemRuleTest extends RuleTestCase
2323

2424
protected function getRule(): Rule
2525
{
26-
$ruleLevelHelper = new RuleLevelHelper(self::createReflectionProvider(), true, false, true, $this->checkExplicitMixed, $this->checkImplicitMixed, false, true);
26+
$ruleLevelHelper = new RuleLevelHelper(
27+
self::createReflectionProvider(),
28+
checkNullables: true,
29+
checkThisOnly: false,
30+
checkUnionTypes: true,
31+
checkExplicitMixed: $this->checkExplicitMixed,
32+
checkImplicitMixed: $this->checkImplicitMixed,
33+
checkBenevolentUnionTypes: false,
34+
discoveringSymbolsTip: true,
35+
);
2736

2837
return new InvalidKeyInArrayItemRule(
2938
$ruleLevelHelper,

‎tests/PHPStan/Rules/Arrays/IterableInForeachRuleTest.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,18 @@ class IterableInForeachRuleTest extends RuleTestCase
2222

2323
protected function getRule(): Rule
2424
{
25-
return new IterableInForeachRule(new RuleLevelHelper(self::createReflectionProvider(), true, false, true, $this->checkExplicitMixed, $this->checkImplicitMixed, false, true));
25+
return new IterableInForeachRule(
26+
new RuleLevelHelper(
27+
self::createReflectionProvider(),
28+
checkNullables: true,
29+
checkThisOnly: false,
30+
checkUnionTypes: true,
31+
checkExplicitMixed: $this->checkExplicitMixed,
32+
checkImplicitMixed: $this->checkImplicitMixed,
33+
checkBenevolentUnionTypes: false,
34+
discoveringSymbolsTip: true,
35+
),
36+
);
2637
}
2738

2839
public function testCheckWithMaybes(): void

‎tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,25 @@ class NonexistentOffsetInArrayDimFetchRuleTest extends RuleTestCase
2525

2626
protected function getRule(): Rule
2727
{
28-
$ruleLevelHelper = new RuleLevelHelper(self::createReflectionProvider(), true, false, true, $this->checkExplicitMixed, $this->checkImplicitMixed, false, true);
28+
$ruleLevelHelper = new RuleLevelHelper(
29+
self::createReflectionProvider(),
30+
checkNullables: true,
31+
checkThisOnly: false,
32+
checkUnionTypes: true,
33+
checkExplicitMixed: $this->checkExplicitMixed,
34+
checkImplicitMixed: $this->checkImplicitMixed,
35+
checkBenevolentUnionTypes: false,
36+
discoveringSymbolsTip: true,
37+
);
2938

3039
return new NonexistentOffsetInArrayDimFetchRule(
3140
$ruleLevelHelper,
32-
new NonexistentOffsetInArrayDimFetchCheck($ruleLevelHelper, true, $this->reportPossiblyNonexistentGeneralArrayOffset, $this->reportPossiblyNonexistentConstantArrayOffset),
41+
new NonexistentOffsetInArrayDimFetchCheck(
42+
$ruleLevelHelper,
43+
reportMaybes: true,
44+
reportPossiblyNonexistentGeneralArrayOffset: $this->reportPossiblyNonexistentGeneralArrayOffset,
45+
reportPossiblyNonexistentConstantArrayOffset: $this->reportPossiblyNonexistentConstantArrayOffset,
46+
),
3347
true,
3448
);
3549
}

‎tests/PHPStan/Rules/Arrays/OffsetAccessAssignOpRuleTest.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@ class OffsetAccessAssignOpRuleTest extends RuleTestCase
1717

1818
protected function getRule(): Rule
1919
{
20-
$ruleLevelHelper = new RuleLevelHelper(self::createReflectionProvider(), true, false, $this->checkUnions, false, false, false, true);
20+
$ruleLevelHelper = new RuleLevelHelper(
21+
self::createReflectionProvider(),
22+
checkNullables: true,
23+
checkThisOnly: false,
24+
checkUnionTypes: $this->checkUnions,
25+
checkExplicitMixed: false,
26+
checkImplicitMixed: false,
27+
checkBenevolentUnionTypes: false,
28+
discoveringSymbolsTip: true,
29+
);
2130
return new OffsetAccessAssignOpRule($ruleLevelHelper);
2231
}
2332

‎tests/PHPStan/Rules/Arrays/OffsetAccessAssignmentRuleTest.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@ class OffsetAccessAssignmentRuleTest extends RuleTestCase
1717

1818
protected function getRule(): Rule
1919
{
20-
$ruleLevelHelper = new RuleLevelHelper(self::createReflectionProvider(), true, false, $this->checkUnionTypes, false, false, false, true);
20+
$ruleLevelHelper = new RuleLevelHelper(
21+
self::createReflectionProvider(),
22+
checkNullables: true,
23+
checkThisOnly: false,
24+
checkUnionTypes: $this->checkUnionTypes,
25+
checkExplicitMixed: false,
26+
checkImplicitMixed: false,
27+
checkBenevolentUnionTypes: false,
28+
discoveringSymbolsTip: true,
29+
);
2130
return new OffsetAccessAssignmentRule($ruleLevelHelper);
2231
}
2332

‎tests/PHPStan/Rules/Arrays/OffsetAccessValueAssignmentRuleTest.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,18 @@ class OffsetAccessValueAssignmentRuleTest extends RuleTestCase
1515

1616
protected function getRule(): Rule
1717
{
18-
return new OffsetAccessValueAssignmentRule(new RuleLevelHelper(self::createReflectionProvider(), true, false, true, false, false, false, true));
18+
return new OffsetAccessValueAssignmentRule(
19+
new RuleLevelHelper(
20+
self::createReflectionProvider(),
21+
checkNullables: true,
22+
checkThisOnly: false,
23+
checkUnionTypes: true,
24+
checkExplicitMixed: false,
25+
checkImplicitMixed: false,
26+
checkBenevolentUnionTypes: false,
27+
discoveringSymbolsTip: true,
28+
),
29+
);
1930
}
2031

2132
public function testRule(): void

0 commit comments

Comments
 (0)