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

Merge branch 'fix_intersection_scanning' into strict_types

Browse Source
This commit is contained in:
Daniil Gentili 2023-07-25 11:54:41 +02:00
commit 9d85198765
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
1 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,22 +358,12 @@ class ClassLikes
}
}
if (!isset($this->existing_classes_lc[$fq_class_name_lc])
|| !$this->existing_classes_lc[$fq_class_name_lc]
|| !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
if ((
!isset($this->existing_classes_lc[$fq_class_name_lc])
|| $this->existing_classes_lc[$fq_class_name_lc]
)
&& !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
if (isset($this->existing_classes_lc[$fq_class_name_lc])) {
return $this->existing_classes_lc[$fq_class_name_lc];
} elseif (!$this->classlike_storage_provider->has($fq_class_name_lc)) {
return $this->existing_classes_lc[$fq_class_name_lc] = false;
}
return false;
}
if ($this->collect_locations && $code_location) {
$this->file_reference_provider->addCallingLocationForClass(
$code_location,
@ -381,7 +371,7 @@ class ClassLikes
);
}
return true;
return $this->existing_classes_lc[$fq_class_name_lc] = true;
}
public function hasFullyQualifiedInterfaceName(
@ -392,22 +382,12 @@ class ClassLikes
): bool {
$fq_class_name_lc = strtolower($this->getUnAliasedName($fq_class_name));
if (!isset($this->existing_interfaces_lc[$fq_class_name_lc])
|| !$this->existing_interfaces_lc[$fq_class_name_lc]
|| !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
if ((
!isset($this->existing_interfaces_lc[$fq_class_name_lc])
|| $this->existing_interfaces_lc[$fq_class_name_lc]
)
&& !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
if (isset($this->existing_interfaces_lc[$fq_class_name_lc])) {
return $this->existing_interfaces_lc[$fq_class_name_lc];
} elseif (!$this->classlike_storage_provider->has($fq_class_name_lc)) {
return $this->existing_interfaces_lc[$fq_class_name_lc] = false;
}
return false;
}
if ($this->collect_references && $code_location) {
if ($calling_method_id) {
$this->file_reference_provider->addMethodReferenceToClass(
@ -442,7 +422,7 @@ class ClassLikes
);
}
return true;
return $this->existing_interfaces_lc[$fq_class_name_lc] = true;
}
public function hasFullyQualifiedEnumName(
@ -453,22 +433,12 @@ class ClassLikes
): bool {
$fq_class_name_lc = strtolower($this->getUnAliasedName($fq_class_name));
if (!isset($this->existing_enums_lc[$fq_class_name_lc])
|| !$this->existing_enums_lc[$fq_class_name_lc]
|| !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
if ((
!isset($this->existing_enums_lc[$fq_class_name_lc])
|| $this->existing_enums_lc[$fq_class_name_lc]
)
&& !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
if (isset($this->existing_enums_lc[$fq_class_name_lc])) {
return $this->existing_enums_lc[$fq_class_name_lc];
} elseif (!$this->classlike_storage_provider->has($fq_class_name_lc)) {
return $this->existing_enums_lc[$fq_class_name_lc] = false;
}
return false;
}
if ($this->collect_references && $code_location) {
if ($calling_method_id) {
$this->file_reference_provider->addMethodReferenceToClass(
@ -503,7 +473,7 @@ class ClassLikes
);
}
return true;
return $this->existing_enums_lc[$fq_class_name_lc] = true;
}
public function hasFullyQualifiedTraitName(string $fq_class_name, ?CodeLocation $code_location = null): bool