Skip to content

Commit 2f8afd4

Browse files
committed
Use PHPStan TypeUtils::flattenTypes() instead of local TypeFlattener copy, it is not deprecated
Amp-Thread-ID: https://ampcode.com/threads/T-01a179f2-995f-7745-8d8c-4c174ba5c0ce
1 parent 9a7ebc5 commit 2f8afd4

2 files changed

Lines changed: 4 additions & 98 deletions

File tree

‎src/NodeTypeResolver/PHPStan/Type/TypeFactory.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use PHPStan\Type\ObjectType;
1717
use PHPStan\Type\StringType;
1818
use PHPStan\Type\Type;
19+
use PHPStan\Type\TypeUtils;
1920
use PHPStan\Type\UnionType;
2021
use Rector\NodeTypeResolver\PHPStan\ObjectWithoutClassTypeWithParentTypes;
2122
use Rector\NodeTypeResolver\PHPStan\TypeHasher;
@@ -126,7 +127,7 @@ private function unwrapUnionedTypes(array $types): array
126127
// unwrap union types
127128
$unwrappedTypes = [];
128129
foreach ($types as $type) {
129-
$flattenTypes = TypeFlattener::flatten($type);
130+
$flattenTypes = TypeUtils::flattenTypes($type);
130131

131132
foreach ($flattenTypes as $flattenType) {
132133
if ($flattenType instanceof ConstantArrayType) {
@@ -201,8 +202,8 @@ private function unwrapConstantArrayTypes(ConstantArrayType $constantArrayType):
201202
{
202203
$unwrappedTypes = [];
203204

204-
$flattenKeyTypes = TypeFlattener::flatten($constantArrayType->getIterableKeyType());
205-
$flattenItemTypes = TypeFlattener::flatten($constantArrayType->getIterableValueType());
205+
$flattenKeyTypes = TypeUtils::flattenTypes($constantArrayType->getIterableKeyType());
206+
$flattenItemTypes = TypeUtils::flattenTypes($constantArrayType->getIterableValueType());
206207

207208
foreach ($flattenItemTypes as $position => $nestedFlattenItemType) {
208209
$nestedFlattenKeyType = $flattenKeyTypes[$position] ?? null;

‎src/NodeTypeResolver/PHPStan/Type/TypeFlattener.php‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)