mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-02-22 18:54:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2986 from snapshotpl/typed-callable

Browse Source 
Typed callable when mixed used
This commit is contained in:
Tomas Votruba 2020-04-14 12:47:54 +02:00 committed by GitHub
commit 4b002502ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/attribute-aware-php-doc/src/Ast/Type/AttributeAwareCallableTypeNode.php
View File

@ -34,7 +34,7 @@ final class AttributeAwareCallableTypeNode extends CallableTypeNode implements A
}
$parameterTypeString = $this->normalizeParameterType($parameterTypeString, $returnTypeAsString);
$returnTypeAsString = $this->normalizeReturnType($returnTypeAsString);
$returnTypeAsString = $this->normalizeReturnType($parameterTypeString, $returnTypeAsString);
return sprintf('%s%s%s', $this->identifier->name, $parameterTypeString, $returnTypeAsString);
}
@ -51,9 +51,9 @@ final class AttributeAwareCallableTypeNode extends CallableTypeNode implements A
return trim($parameterTypeString);
}
private function normalizeReturnType(string $returnTypeAsString): string
private function normalizeReturnType(string $parameterTypeString, string $returnTypeAsString): string
{
if ($returnTypeAsString === 'mixed') {
if ($returnTypeAsString === 'mixed' && $parameterTypeString === '') {
return '';
}

1
packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureCallable/callable_empty_params.txt Normal file
View File

@ -0,0 +1 @@
/** @var callable():int */

2
packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureCallable/callable_mixed.txt
View File

@ -1 +1 @@
/** @var callable(array<mixed>) */
/** @var callable(array<mixed>):mixed */

2
packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureCallable/callable_param.txt
View File

@ -1 +1 @@
/** @param callable(array<mixed>) $hitCallback */
/** @param callable(array<mixed>):mixed $hitCallback */

1
packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureCallable/callable_without_types.txt Normal file
View File

@ -0,0 +1 @@
/** @var callable */