danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix intersection scanning

Browse Source
This commit is contained in:
Daniil Gentili 2023-07-26 10:04:20 +02:00
parent be82c3a948
commit 8364fef8b8
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Psalm/Internal/Codebase/ClassLikes.php
View File

@ -2347,15 +2347,31 @@ class ClassLikes
$existing_classes,
] = $thread_data;
$this->existing_classlikes_lc = array_merge($existing_classlikes_lc, $this->existing_classlikes_lc);
$this->existing_classes_lc = array_merge($existing_classes_lc, $this->existing_classes_lc);
$this->existing_traits_lc = array_merge($existing_traits_lc, $this->existing_traits_lc);
$this->existing_traits = array_merge($existing_traits, $this->existing_traits);
$this->existing_enums_lc = array_merge($existing_enums_lc, $this->existing_enums_lc);
$this->existing_enums = array_merge($existing_enums, $this->existing_enums);
$this->existing_interfaces_lc = array_merge($existing_interfaces_lc, $this->existing_interfaces_lc);
$this->existing_interfaces = array_merge($existing_interfaces, $this->existing_interfaces);
$this->existing_classes = array_merge($existing_classes, $this->existing_classes);
$this->existing_classlikes_lc = self::mergeThreadData($existing_classlikes_lc, $this->existing_classlikes_lc);
$this->existing_classes_lc = self::mergeThreadData($existing_classes_lc, $this->existing_classes_lc);
$this->existing_traits_lc = self::mergeThreadData($existing_traits_lc, $this->existing_traits_lc);
$this->existing_traits = self::mergeThreadData($existing_traits, $this->existing_traits);
$this->existing_enums_lc = self::mergeThreadData($existing_enums_lc, $this->existing_enums_lc);
$this->existing_enums = self::mergeThreadData($existing_enums, $this->existing_enums);
$this->existing_interfaces_lc = self::mergeThreadData($existing_interfaces_lc, $this->existing_interfaces_lc);
$this->existing_interfaces = self::mergeThreadData($existing_interfaces, $this->existing_interfaces);
$this->existing_classes = self::mergeThreadData($existing_classes, $this->existing_classes);
}
/**
* @template T as string|lowercase-string
* @param array<T, bool> $old
* @param array<T, bool> $new
* @return array<T, bool>
*/
private static function mergeThreadData(array $old, array $new): array
{
foreach ($new as $name => $value) {
if (!isset($old[$name]) || (!$old[$name] && $value)) {
$old[$name] = $value;
}
}
return $old;
}
public function getStorageFor(string $fq_class_name): ?ClassLikeStorage