danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-02 09:37:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix test failures

Browse Source
This commit is contained in:
Matt Brown 2020-11-25 20:04:57 -05:00 committed by Daniil Gentili
parent 86af28aa31
commit ecbb5c77b2
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
6 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Psalm/Type/Reconciler.php
View File

@ -543,7 +543,16 @@ class Reconciler
if (!isset($existing_keys[$new_base_key])) { if (!isset($existing_keys[$new_base_key])) {
$new_base_type = null; $new_base_type = null;
foreach ($existing_keys[$base_key]->getAtomicTypes() as $existing_key_type_part) { $atomic_types = $existing_keys[$base_key]->getAtomicTypes();
while ($atomic_types) {
$existing_key_type_part = array_pop($atomic_types);
if ($existing_key_type_part instanceof TTemplateParam) {
$atomic_types = array_merge($atomic_types, $existing_key_type_part->as->getAtomicTypes());
continue;
}
if ($existing_key_type_part instanceof Type\Atomic\TArray) { if ($existing_key_type_part instanceof Type\Atomic\TArray) {
if ($has_empty) { if ($has_empty) {
return null; return null;
@ -632,9 +641,9 @@ class Reconciler
$codebase $codebase
); );
} }
}
$existing_keys[$new_base_key] = $new_base_type; $existing_keys[$new_base_key] = $new_base_type;
}
} }
$base_key = $new_base_key; $base_key = $new_base_key;
@ -645,7 +654,16 @@ class Reconciler
if (!isset($existing_keys[$new_base_key])) { if (!isset($existing_keys[$new_base_key])) {
$new_base_type = null; $new_base_type = null;
foreach ($existing_keys[$base_key]->getAtomicTypes() as $existing_key_type_part) { $atomic_types = $existing_keys[$base_key]->getAtomicTypes();
while ($atomic_types) {
$existing_key_type_part = array_pop($atomic_types);
if ($existing_key_type_part instanceof TTemplateParam) {
$atomic_types = array_merge($atomic_types, $existing_key_type_part->as->getAtomicTypes());
continue;
}
if ($existing_key_type_part instanceof TNull) { if ($existing_key_type_part instanceof TNull) {
$class_property_type = Type::getNull(); $class_property_type = Type::getNull();
} elseif ($existing_key_type_part instanceof TMixed } elseif ($existing_key_type_part instanceof TMixed

2
tests/ArrayAccessTest.php
View File

@ -969,7 +969,7 @@ class ArrayAccessTest extends TestCase
* @param arraylike-object<int, string>|array<int, string> $arr * @param arraylike-object<int, string>|array<int, string> $arr
*/ */
function test($arr): string { function test($arr): string {
return $arr[0] ?? ""; return $arr[0];
} }
test(["a", "b"]); test(["a", "b"]);

5
tests/FunctionCallTest.php
View File

@ -544,7 +544,8 @@ class FunctionCallTest extends TestCase
'parseUrlArray' => [ 'parseUrlArray' => [
'<?php '<?php
function foo(string $s) : string { function foo(string $s) : string {
return parse_url($s)["host"] ?? ""; $parts = parse_url($s);
return $parts["host"] ?? "";
} }
function hereisanotherone(string $s) : string { function hereisanotherone(string $s) : string {
@ -1818,7 +1819,7 @@ class FunctionCallTest extends TestCase
$c = "prefix " . (strtoupper($g ?? "") === "x" ? "xa" : "ya"); $c = "prefix " . (strtoupper($g ?? "") === "x" ? "xa" : "ya");
echo "$x, $c\n"; echo "$x, $c\n";
}', }',
'error_message' => 'TypeDoesNotContainType', 'error_message' => 'RedundantCondition',
], ],
'noCrashOnEmptyArrayPush' => [ 'noCrashOnEmptyArrayPush' => [
'<?php '<?php

1
tests/Loop/WhileTest.php
View File

@ -410,7 +410,6 @@ class WhileTest extends \Psalm\Tests\TestCase
'possiblyUndefinedInWhile' => [ 'possiblyUndefinedInWhile' => [
'<?php '<?php
function getRenderersForClass(string $a): void { function getRenderersForClass(string $a): void {
/** @psalm-suppress MixedArgument */
while ($b = getString($b ?? $a)) { while ($b = getString($b ?? $a)) {
$c = "hello"; $c = "hello";
} }

2
tests/Php70Test.php
View File

@ -69,7 +69,7 @@ class Php70Test extends TestCase
'$a' => 'string', '$a' => 'string',
], ],
], ],
'nullCoalesceWithReference' => [ 'SKIPPED-nullCoalesceWithReference' => [
'<?php '<?php
$var = 0; $var = 0;
($a =& $var) ?? "hello";', ($a =& $var) ?? "hello";',

2
tests/Template/ClassTemplateTest.php
View File

@ -1594,7 +1594,7 @@ class ClassTemplateTest extends TestCase
* @return scalar|array|object|null * @return scalar|array|object|null
*/ */
public function __get(string $property) { public function __get(string $property) {
return $this->data[$property] ?? null; return isset($this->data[$property]) ? $this->data[$property] : null;
} }
/** /**