Skip to content

Commit 8623603

Browse files
committed
Remove usages of deprecated TList types
1 parent e6af6fc commit 8623603

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

.github/workflows/psl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
working-directory: psl
3434
run: |
3535
composer config repositories.psalm-plugin path ../
36-
composer require --dev 'php-standard-library/psalm-plugin:*@dev'
36+
composer require --dev 'php-standard-library/psalm-plugin:*@dev' 'vimeo/psalm:>=5.16'
3737
3838
- name: "installing dependencies"
3939
working-directory: psl

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"php": "^8.1",
14-
"vimeo/psalm": "^5.0"
14+
"vimeo/psalm": ">=5.16"
1515
},
1616
"conflict": {
1717
"azjezz/psl": "<2.0"

src/EventHandler/Str/Chunk/FunctionReturnTypeProvider.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,26 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
2727
$argument_type = Argument::getType($event->getCallArgs(), $event->getStatementsSource(), 0);
2828
if (null === $argument_type) {
2929
// [unknown] -> list<string>
30-
return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
30+
return Type::getList(Type::getString());
3131
}
3232

3333
$string_argument_type = $argument_type->getAtomicTypes()['string'] ?? null;
3434
if (null === $string_argument_type) {
3535
// [unknown] -> list<string>
36-
return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
36+
return Type::getList(Type::getString());
3737
}
3838

3939
if ($string_argument_type instanceof Type\Atomic\TNonEmptyString) {
4040
// non-empty-lowercase-string => non-empty-list<non-empty-lowercase-string>
4141
if ($string_argument_type instanceof Type\Atomic\TNonEmptyLowercaseString) {
42-
return new Type\Union([
43-
new Type\Atomic\TNonEmptyList(new Type\Union([
44-
new Type\Atomic\TNonEmptyLowercaseString()
45-
]))
46-
]);
42+
return Type::getNonEmptyList(Type::getNonEmptyLowercaseString());
4743
}
4844

4945
// non-empty-string => non-empty-list<non-empty-string>
50-
return new Type\Union([new Type\Atomic\TNonEmptyList(new Type\Union([new Type\Atomic\TNonEmptyString()]))]);
46+
return Type::getNonEmptyList(Type::getNonEmptyString());
5147
}
5248

5349
// string -> list<string>
54-
return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
50+
return Type::getList(Type::getString());
5551
}
5652
}

src/EventHandler/Str/Split/FunctionReturnTypeProvider.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,26 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
2727
$argument_type = Argument::getType($event->getCallArgs(), $event->getStatementsSource(), 0);
2828
if (null === $argument_type) {
2929
// [unknown] -> list<string>
30-
return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
30+
return Type::getList(Type::getString());
3131
}
3232

3333
$string_argument_type = $argument_type->getAtomicTypes()['string'] ?? null;
3434
if (null === $string_argument_type) {
3535
// [unknown] -> list<string>
36-
return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
36+
return Type::getList(Type::getString());
3737
}
3838

3939
if ($string_argument_type instanceof Type\Atomic\TNonEmptyString) {
4040
// non-empty-lowercase-string => non-empty-list<non-empty-lowercase-string>
4141
if ($string_argument_type instanceof Type\Atomic\TNonEmptyLowercaseString) {
42-
return new Type\Union([
43-
new Type\Atomic\TNonEmptyList(new Type\Union([
44-
new Type\Atomic\TNonEmptyLowercaseString()
45-
]))
46-
]);
42+
return Type::getNonEmptyList(Type::getNonEmptyLowercaseString());
4743
}
4844

4945
// non-empty-string => non-empty-list<non-empty-string>
50-
return new Type\Union([new Type\Atomic\TNonEmptyList(new Type\Union([new Type\Atomic\TNonEmptyString()]))]);
46+
return Type::getNonEmptyList(Type::getNonEmptyString());
5147
}
5248

5349
// string -> list<string>
54-
return new Type\Union([new Type\Atomic\TList(new Type\Union([new Type\Atomic\TString()]))]);
50+
return Type::getList(Type::getString());
5551
}
5652
}

0 commit comments

Comments
 (0)