Skip to content

Commit 39a530c

Browse files
TomasVotrubaTomasVotruba
authored
[DX] Add strict PHPStan rules - step #2 (#1330)
1 parent f985e81 commit 39a530c

File tree

115 files changed

+317
-276
lines changed

Some content is hidden

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

115 files changed

+317
-276
lines changed

‎phpstan.neon‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,3 +583,10 @@ parameters:
583583

584584
# skip === false compare
585585
- '#Do not compare call directly, use a variable assign#'
586+
587+
# strict - resolve later
588+
- '#Foreach overwrites \$(.*?) with its value variable#'
589+
590+
-
591+
message: '#Strict comparison using \!\=\= between null and null will always evaluate to false#'
592+
path: rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php

‎rules-tests/Transform/Rector/FuncCall/FuncCallToNewRector/config/configured_rule.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
return static function (ContainerConfigurator $containerConfigurator): void {
99
$services = $containerConfigurator->services();
1010
$services->set(FuncCallToNewRector::class)
11-
->call('configure', [[
12-
FuncCallToNewRector::FUNCTIONS_TO_NEWS => [
13-
'collection' => ['Collection'],
14-
],
15-
]]);
11+
->configure([
12+
'collection' => 'Collection',
13+
]);
1614
};

‎rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ public function refactor(Node $node): MethodCall | StaticCall | ClassMethod | nu
130130
}
131131

132132
/**
133-
* @param array<string, ArgumentAdder[]> $configuration
133+
* @param mixed[] $configuration
134134
*/
135135
public function configure(array $configuration): void
136136
{
137-
$addedArguments = $configuration[self::ADDED_ARGUMENTS] ?? ($configuration ?: []);
138-
Assert::allIsInstanceOf($addedArguments, ArgumentAdder::class);
137+
$addedArguments = $configuration[self::ADDED_ARGUMENTS] ?? $configuration;
138+
Assert::allIsAOf($addedArguments, ArgumentAdder::class);
139139
$this->addedArguments = $addedArguments;
140140
}
141141

‎rules/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ public function refactor(Node $node): MethodCall | StaticCall | ClassMethod
100100
}
101101

102102
/**
103-
* @param array<string, ReplaceArgumentDefaultValue[]> $configuration
103+
* @param mixed[] $configuration
104104
*/
105105
public function configure(array $configuration): void
106106
{
107-
$replacedArguments = $configuration[self::REPLACED_ARGUMENTS] ?? ($configuration ?: []);
108-
Assert::allIsInstanceOf($replacedArguments, ReplaceArgumentDefaultValue::class);
107+
$replacedArguments = $configuration[self::REPLACED_ARGUMENTS] ?? $configuration;
108+
Assert::allIsAOf($replacedArguments, ReplaceArgumentDefaultValue::class);
109109
$this->replacedArguments = $replacedArguments;
110110
}
111111
}

‎rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ public function refactor(Node $node): FuncCall
8484
}
8585

8686
/**
87-
* @param array<string, ReplaceFuncCallArgumentDefaultValue[]> $configuration
87+
* @param mixed[] $configuration
8888
*/
8989
public function configure(array $configuration): void
9090
{
91-
$replacedArguments = $configuration[self::REPLACED_ARGUMENTS] ?? ($configuration ?: []);
92-
Assert::allIsInstanceOf($replacedArguments, ReplaceFuncCallArgumentDefaultValue::class);
91+
$replacedArguments = $configuration[self::REPLACED_ARGUMENTS] ?? $configuration;
92+
Assert::allIsAOf($replacedArguments, ReplaceFuncCallArgumentDefaultValue::class);
9393
$this->replacedArguments = $replacedArguments;
9494
}
9595
}

‎rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ public function refactor(Node $node): ?FuncCall
106106
}
107107

108108
/**
109-
* @param array<string, SwapFuncCallArguments[]> $configuration
109+
* @param mixed[] $configuration
110110
*/
111111
public function configure(array $configuration): void
112112
{
113-
$functionArgumentSwaps = $configuration[self::FUNCTION_ARGUMENT_SWAPS] ?? ($configuration ?: []);
114-
Assert::allIsInstanceOf($functionArgumentSwaps, SwapFuncCallArguments::class);
113+
$functionArgumentSwaps = $configuration[self::FUNCTION_ARGUMENT_SWAPS] ?? $configuration;
114+
Assert::allIsAOf($functionArgumentSwaps, SwapFuncCallArguments::class);
115115
$this->functionArgumentSwaps = $functionArgumentSwaps;
116116
}
117117

‎rules/Autodiscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,12 @@ public function refactor(Node $node): ?Node
9191
}
9292

9393
/**
94-
* @param array<string, string[]> $configuration
94+
* @param mixed[] $configuration
9595
*/
9696
public function configure(array $configuration): void
9797
{
98-
$groupNamesBySuffix = $configuration[self::GROUP_NAMES_BY_SUFFIX] ?? ($configuration ?: []);
98+
$groupNamesBySuffix = $configuration[self::GROUP_NAMES_BY_SUFFIX] ?? $configuration;
99+
Assert::isArray($groupNamesBySuffix);
99100
Assert::allString($groupNamesBySuffix);
100101

101102
$this->groupNamesBySuffix = $groupNamesBySuffix;

‎rules/Autodiscovery/Rector/Class_/MoveValueObjectsToValueObjectDirectoryRector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function refactor(Node $node): ?Node
151151
}
152152

153153
/**
154-
* @param array<string, mixed> $configuration
154+
* @param mixed[] $configuration
155155
*/
156156
public function configure(array $configuration): void
157157
{

‎rules/CodingStyle/Rector/ClassMethod/OrderAttributesRector.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ public function refactor(Node $node): ?Node
108108
}
109109

110110
/**
111-
* @param array<string, mixed> $configuration
111+
* @param mixed[] $configuration
112112
*/
113113
public function configure(array $configuration): void
114114
{
115-
$attributesOrder = $configuration[self::ATTRIBUTES_ORDER] ?? ($configuration ?: []);
115+
$attributesOrder = $configuration[self::ATTRIBUTES_ORDER] ?? $configuration;
116116
Assert::isArray($attributesOrder);
117117
Assert::allString($attributesOrder);
118118

‎rules/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ public function refactor(Node $node): ?Node
124124
}
125125

126126
/**
127-
* @param array<string, ReturnArrayClassMethodToYield[]> $configuration
127+
* @param mixed[] $configuration
128128
*/
129129
public function configure(array $configuration): void
130130
{
131-
$methodsToYields = $configuration[self::METHODS_TO_YIELDS] ?? ($configuration ?: []);
132-
Assert::allIsInstanceOf($methodsToYields, ReturnArrayClassMethodToYield::class);
131+
$methodsToYields = $configuration[self::METHODS_TO_YIELDS] ?? $configuration;
132+
Assert::allIsAOf($methodsToYields, ReturnArrayClassMethodToYield::class);
133133
$this->methodsToYields = $methodsToYields;
134134
}
135135

0 commit comments

Comments
 (0)