danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 13:51:54 +01:00
Code Issues Projects Releases Wiki Activity

The function in a callable-array is a non-empty-string

Browse Source
This commit is contained in:
robchett 2023-06-17 09:44:45 +01:00
parent df6b5fbb75
commit 889bdca461
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Internal/Type/SimpleAssertionReconciler.php
View File

@ -2304,7 +2304,7 @@ class SimpleAssertionReconciler extends Reconciler
} elseif ($type instanceof TCallable) {
$array_types[] = new TCallableKeyedArray([
new Union([new TClassString, new TObject]),
Type::getString(),
Type::getNonEmptyString(),
]);
$redundant = false;
@ -2428,7 +2428,7 @@ class SimpleAssertionReconciler extends Reconciler
} elseif ($type instanceof TCallable) {
$array_types[] = new TCallableKeyedArray([
new Union([new TClassString, new TObject]),
Type::getString(),
Type::getNonEmptyString(),
]);
$redundant = false;

4
src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php
View File

@ -1190,7 +1190,7 @@ class SimpleNegatedAssertionReconciler extends Reconciler
} elseif ($type instanceof TCallable) {
$non_object_types[] = new TCallableKeyedArray([
new Union([new TClassString, new TObject]),
Type::getString(),
Type::getNonEmptyString(),
]);
$non_object_types[] = new TCallableString();
$redundant = false;
@ -1589,7 +1589,7 @@ class SimpleNegatedAssertionReconciler extends Reconciler
} elseif ($type instanceof TCallable) {
$non_string_types[] = new TCallableKeyedArray([
new Union([new TClassString, new TObject]),
Type::getString(),
Type::getNonEmptyString(),
]);
$non_string_types[] = new TCallableObject();
$redundant = false;

2
src/Psalm/Type/Atomic.php
View File

@ -266,7 +266,7 @@ abstract class Atomic implements TypeNode
true,
);
$object = new TObject(true);
$string = new TString(true);
$string = new TNonEmptyString(true);
return new TCallableKeyedArray([
new Union([$classString, $object]),
new Union([$string]),

2
tests/TypeReconciliation/ReconcilerTest.php
View File

@ -156,7 +156,7 @@ class ReconcilerTest extends TestCase
'nullableClassStringTruthy' => ['class-string<SomeClass>', new Truthy(), 'class-string<SomeClass>|null'],
'iterableToArray' => ['array<int, int>', new IsType(new TArray([Type::getArrayKey(), Type::getMixed()])), 'iterable<int, int>'],
'iterableToTraversable' => ['Traversable<int, int>', new IsType(new TNamedObject('Traversable')), 'iterable<int, int>'],
'callableToCallableArray' => ['callable-array{class-string|object, string}', new IsType(new TArray([Type::getArrayKey(), Type::getMixed()])), 'callable'],
'callableToCallableArray' => ['callable-array{class-string|object, non-empty-string}', new IsType(new TArray([Type::getArrayKey(), Type::getMixed()])), 'callable'],
'SmallKeyedArrayAndCallable' => ['array{test: string}', new IsType(new TKeyedArray(['test' => Type::getString()])), 'callable'],
'BigKeyedArrayAndCallable' => ['array{foo: string, test: string, thing: string}', new IsType(new TKeyedArray(['foo' => Type::getString(), 'test' => Type::getString(), 'thing' => Type::getString()])), 'callable'],
'callableOrArrayToCallableArray' => ['array<array-key, mixed>', new IsType(new TArray([Type::getArrayKey(), Type::getMixed()])), 'callable|array'],