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

Fix mixed type hole when sending Foo<string> to Foo<mixed> (#8481)

Browse Source 
* Fix mixed type hole when sending Foo<string> to Foo<mixed>

* Fix ifThisIs test

* Suppress bugs highlighted with fix

* Fix PHPDoc parsing
This commit is contained in:
Matthew Brown 2022-09-13 13:13:06 -04:00 committed by GitHub
parent afe85fad86
commit d957ff2015
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -52,6 +52,7 @@
"phpunit/phpunit": "^9.5",
"psalm/plugin-phpunit": "^0.16",
"slevomat/coding-standard": "^7.0",
"phpstan/phpdoc-parser": "1.6.4",
"squizlabs/php_codesniffer": "^3.6",
"symfony/process": "^4.3 || ^5.0 || ^6.0"
},

1
psalm.xml.dist
View File

@ -38,6 +38,7 @@
<file name="vendor/felixfbecker/advanced-json-rpc/lib/Dispatcher.php" />
<directory name="vendor/netresearch/jsonmapper" />
<directory name="vendor/phpunit" />
<file name="vendor/nikic/php-parser/lib/PhpParser/Node/UnionType.php" />
</ignoreFiles>
</projectFiles>

2
src/Psalm/Internal/LanguageServer/Client/TextDocument.php
View File

@ -57,6 +57,8 @@ class TextDocument
* @param TextDocumentIdentifier $textDocument The document to get the content for
*
* @return Promise<TextDocumentItem> The document's current content
*
* @psalm-suppress MixedReturnTypeCoercion due to Psalm bug
*/
public function xcontent(TextDocumentIdentifier $textDocument): Promise
{

6
src/Psalm/Internal/Type/Comparator/GenericTypeComparator.php
View File

@ -166,14 +166,8 @@ class GenericTypeComparator
&& $input_param->isStaticObject()
) {
// do nothing
} else {
if ($container_param->hasMixed() || $container_param->isArrayKey()) {
if ($atomic_comparison_result) {
$atomic_comparison_result->type_coerced_from_mixed = true;
}
} else {
$all_types_contain = false;
}
if ($atomic_comparison_result) {
$atomic_comparison_result->type_coerced = false;

6
tests/IfThisIsTest.php
View File

@ -219,7 +219,7 @@ class IfThisIsTest extends TestCase
'ifThisIsResolveTemplateParams' => [
'code' => '<?php
/**
* @template T
* @template-covariant T
*/
final class Option
{
@ -228,8 +228,8 @@ class IfThisIsTest extends TestCase
}
/**
* @template L
* @template R
* @template-covariant L
* @template-covariant R
*/
final class Either
{

5
tests/Template/ClassTemplateExtendsTest.php
View File

@ -987,15 +987,16 @@ class ClassTemplateExtendsTest extends TestCase
}
}
/** @var SplObjectStorage<\stdClass, string> */
/** @var SplObjectStorage<\stdClass, mixed> */
$storage = new SplObjectStorage();
new SomeService($storage);
$c = new \stdClass();
$storage[$c] = "hello";
/** @psalm-suppress MixedAssignment */
$b = $storage->offsetGet($c);',
'assertions' => [
'$b' => 'string',
'$b' => 'mixed',
],
],
'extendsArrayIterator' => [

17
tests/Template/ClassTemplateTest.php
View File

@ -4600,6 +4600,23 @@ class ClassTemplateTest extends TestCase
final class Three {}',
'error_message' => 'InvalidReturnStatement - src' . DIRECTORY_SEPARATOR . 'somefile.php:12:40 - The inferred type \'T:A as One|Two\' ',
],
'preventMixedNestedCoercion' => [
'code' => '<?php
/** @template T */
class MyCollection {
/** @param array<T> $members */
public function __construct(public array $members) {}
}
/**
* @param MyCollection<string> $c
* @return MyCollection<mixed>
*/
function getMixedCollection(MyCollection $c): MyCollection {
return $c;
}',
'error_message' => 'InvalidReturnStatement',
],
];
}
}