Skip to content

Commit b83587c

Browse files
committed
lint
1 parent a1f0535 commit b83587c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/PhpDoc/TypeNodeResolver.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
use PHPStan\Type\ThisType;
104104
use PHPStan\Type\Type;
105105
use PHPStan\Type\TypeAlias;
106-
use PHPStan\Type\GenericTypeAliasType;
107106
use PHPStan\Type\TypeAliasResolver;
108107
use PHPStan\Type\TypeAliasResolverProvider;
109108
use PHPStan\Type\TypeCombinator;

src/Rules/MissingTypehintCheck.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
use PHPStan\Type\Generic\GenericStaticType;
1919
use PHPStan\Type\Generic\TemplateType;
2020
use PHPStan\Type\Generic\TemplateTypeHelper;
21+
use PHPStan\Type\GenericTypeAliasType;
2122
use PHPStan\Type\IntersectionType;
2223
use PHPStan\Type\MixedType;
2324
use PHPStan\Type\ObjectType;
2425
use PHPStan\Type\Type;
25-
use PHPStan\Type\GenericTypeAliasType;
2626
use PHPStan\Type\TypeTraverser;
2727
use Traversable;
2828
use function array_filter;

src/Type/GenericTypeAliasType.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use PHPStan\Type\Generic\TemplateTypeVarianceMap;
1212
use PHPStan\Type\Traits\LateResolvableTypeTrait;
1313
use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
14+
use function array_keys;
1415
use function array_map;
1516
use function array_merge;
1617
use function array_unique;
@@ -68,9 +69,11 @@ public function getMissingRequiredParamNames(): array
6869
{
6970
$missing = [];
7071
foreach ($this->paramNames as $i => $name) {
71-
if (!isset($this->args[$i]) && $this->defaults[$i] === null) {
72-
$missing[] = $name;
72+
if (isset($this->args[$i]) || $this->defaults[$i] !== null) {
73+
continue;
7374
}
75+
76+
$missing[] = $name;
7477
}
7578

7679
return $missing;
@@ -136,7 +139,7 @@ public function isResolvable(): bool
136139
}
137140
}
138141

139-
foreach ($this->paramNames as $i => $name) {
142+
foreach (array_keys($this->paramNames) as $i) {
140143
if (!isset($this->args[$i]) && $this->defaults[$i] === null) {
141144
return false;
142145
}
@@ -227,4 +230,3 @@ public function toPhpDocNode(): TypeNode
227230
}
228231

229232
}
230-

src/Type/TypeAlias.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use function array_map;
1818
use function array_values;
1919
use function count;
20-
use function array_fill;
2120

2221
final class TypeAlias
2322
{

0 commit comments

Comments
 (0)