danog/psalm-plugin-phpunit
1
0
Fork 0
mirror of https://github.com/danog/psalm-plugin-phpunit.git synced 2024-12-03 09:57:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Addressed code review comments

Browse Source
This commit is contained in:
Bruce Weirdan 2019-02-23 20:15:07 +02:00
parent 586c2ef133
commit c13cf7b5fa
No known key found for this signature in database
GPG Key ID: CFC3AAB181751B0D
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hooks/TestCaseHandler.php
View File

@ -134,7 +134,8 @@ class TestCaseHandler implements AfterClassLikeVisitInterface, AfterClassLikeAna
// unionize iterable so that instead of array<int,string>|Traversable<object|int> // unionize iterable so that instead of array<int,string>|Traversable<object|int>
// we get iterable<int|object,string|int> // we get iterable<int|object,string|int>
//
// TODO: this may get implemented in a future Psalm version, remove it then
$provider_return_type = self::unionizeIterables($codebase, $provider_return_type); $provider_return_type = self::unionizeIterables($codebase, $provider_return_type);
if (!self::isTypeContainedByType( if (!self::isTypeContainedByType(
@ -236,7 +237,6 @@ class TestCaseHandler implements AfterClassLikeVisitInterface, AfterClassLikeAna
)); ));
} }
foreach ($method_storage->params as $param_offset => $param) { foreach ($method_storage->params as $param_offset => $param) {
if (!isset($potential_argument_types[$param_offset])) { if (!isset($potential_argument_types[$param_offset])) {
break; break;
@ -257,12 +257,15 @@ class TestCaseHandler implements AfterClassLikeVisitInterface, AfterClassLikeAna
): bool { ): bool {
if (method_exists($codebase, 'isTypeContainedByType')) { if (method_exists($codebase, 'isTypeContainedByType')) {
return (bool) $codebase->isTypeContainedByType($input_type, $container_type); return (bool) $codebase->isTypeContainedByType($input_type, $container_type);
} elseif (class_exists(\Psalm\Internal\Analyzer\TypeAnalyzer::class, true) }
/** @psalm-suppress RedundantCondition */
if (class_exists(\Psalm\Internal\Analyzer\TypeAnalyzer::class, true)
&& method_exists(\Psalm\Internal\Analyzer\TypeAnalyzer::class, 'isContainedBy')) { && method_exists(\Psalm\Internal\Analyzer\TypeAnalyzer::class, 'isContainedBy')) {
return \Psalm\Internal\Analyzer\TypeAnalyzer::isContainedBy($codebase, $input_type, $container_type); return \Psalm\Internal\Analyzer\TypeAnalyzer::isContainedBy($codebase, $input_type, $container_type);
} else {
throw new UnsupportedPsalmVersion();
} }
throw new UnsupportedPsalmVersion();
} }
private static function canTypeBeContainedByType( private static function canTypeBeContainedByType(
@ -272,12 +275,15 @@ class TestCaseHandler implements AfterClassLikeVisitInterface, AfterClassLikeAna
): bool { ): bool {
if (method_exists($codebase, 'canTypeBeContainedByType')) { if (method_exists($codebase, 'canTypeBeContainedByType')) {
return (bool) $codebase->canTypeBeContainedByType($input_type, $container_type); return (bool) $codebase->canTypeBeContainedByType($input_type, $container_type);
} elseif (class_exists(\Psalm\Internal\Analyzer\TypeAnalyzer::class, true) }
/** @psalm-suppress RedundantCondition */
if (class_exists(\Psalm\Internal\Analyzer\TypeAnalyzer::class, true)
&& method_exists(\Psalm\Internal\Analyzer\TypeAnalyzer::class, 'canBeContainedBy')) { && method_exists(\Psalm\Internal\Analyzer\TypeAnalyzer::class, 'canBeContainedBy')) {
return \Psalm\Internal\Analyzer\TypeAnalyzer::canBeContainedBy($codebase, $input_type, $container_type); return \Psalm\Internal\Analyzer\TypeAnalyzer::canBeContainedBy($codebase, $input_type, $container_type);
} else {
throw new UnsupportedPsalmVersion();
} }
throw new UnsupportedPsalmVersion();
} }
/** /**
@ -291,7 +297,10 @@ class TestCaseHandler implements AfterClassLikeVisitInterface, AfterClassLikeAna
assert($ret[0] instanceof Type\Union); assert($ret[0] instanceof Type\Union);
assert($ret[1] instanceof Type\Union); assert($ret[1] instanceof Type\Union);
return [$ret[0], $ret[1]]; return [$ret[0], $ret[1]];
} elseif (class_exists(\Psalm\Internal\Analyzer\Statements\Block\ForeachAnalyzer::class, true) }
/** @psalm-suppress RedundantCondition */
if (class_exists(\Psalm\Internal\Analyzer\Statements\Block\ForeachAnalyzer::class, true)
&& method_exists( && method_exists(
\Psalm\Internal\Analyzer\Statements\Block\ForeachAnalyzer::class, \Psalm\Internal\Analyzer\Statements\Block\ForeachAnalyzer::class,
'getKeyValueParamsForTraversableObject' 'getKeyValueParamsForTraversableObject'
@ -311,9 +320,9 @@ class TestCaseHandler implements AfterClassLikeVisitInterface, AfterClassLikeAna
$iterable_key_type ?? Type::getMixed(), $iterable_key_type ?? Type::getMixed(),
$iterable_value_type ?? Type::getMixed(), $iterable_value_type ?? Type::getMixed(),
]; ];
} else {
throw new UnsupportedPsalmVersion();
} }
throw new UnsupportedPsalmVersion();
} }
private static function unionizeIterables(Codebase $codebase, Type\Union $iterables): Type\Atomic\TIterable private static function unionizeIterables(Codebase $codebase, Type\Union $iterables): Type\Atomic\TIterable