1
0
mirror of https://github.com/danog/psalm.git synced 2024-12-12 01:09:38 +01:00
This commit is contained in:
Daniil Gentili 2023-07-25 11:52:50 +02:00
parent f21390d7ce
commit 5e77f1b9e2
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7

View File

@ -356,20 +356,10 @@ 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)
) {
return $this->existing_classes_lc[$fq_class_name_lc] = false;
}
return false;
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;
}
if ($this->collect_locations && $code_location) {
@ -379,7 +369,7 @@ class ClassLikes
);
}
return true;
return $this->existing_classes_lc[$fq_class_name_lc] = true;
}
public function hasFullyQualifiedInterfaceName(
@ -390,20 +380,10 @@ 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)
) {
return $this->existing_interfaces_lc[$fq_class_name_lc] = false;
}
return false;
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;
}
if ($this->collect_references && $code_location) {
@ -440,7 +420,7 @@ class ClassLikes
);
}
return true;
return $this->existing_interfaces_lc[$fq_class_name_lc] = true;
}
public function hasFullyQualifiedEnumName(
@ -451,20 +431,10 @@ 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)
) {
return $this->existing_enums_lc[$fq_class_name_lc] = false;
}
return false;
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;
}
if ($this->collect_references && $code_location) {
@ -501,7 +471,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