Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo in ObjectType #3206

Merged
merged 5 commits into from
Jul 2, 2024
Merged

Fix typo in ObjectType #3206

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b8ddcb
Fix typo in ObjectType
staabm Jul 2, 2024
d6f8165
Update ObjectType.php
staabm Jul 2, 2024
23e5e3f
simplify no longer necessary code
staabm Jul 2, 2024
6aa620d
remove another unnecessary loop
staabm Jul 2, 2024
d6ebaad
improve variable names
staabm Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions src/Type/ObjectType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,15 +1230,15 @@ public function getEnumCases(): array
$className = $classReflection->getName();

if ($this->subtractedType !== null) {
$subtracedEnumCaseNames = [];
$subtractedEnumCaseNames = [];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo-fix


foreach ($this->subtractedType->getEnumCases() as $subtractedCase) {
$subtracedEnumCaseNames[$subtractedCase->getEnumCaseName()] = true;
$subtractedEnumCaseNames[$subtractedCase->getEnumCaseName()] = true;
}

$cases = [];
foreach ($classReflection->getEnumCases() as $enumCase) {
if (array_key_exists($enumCase->getName(), $subtracedEnumCaseNames)) {
if (array_key_exists($enumCase->getName(), $subtractedEnumCaseNames)) {
continue;
}
$cases[] = new EnumCaseObjectType($className, $enumCase->getName(), $classReflection);
Expand Down Expand Up @@ -1371,27 +1371,20 @@ public function changeSubtractedType(?Type $subtractedType): Type
{
if ($subtractedType !== null) {
$classReflection = $this->getClassReflection();
$allowedSubTypesList = $classReflection !== null ? $classReflection->getAllowedSubTypes() : null;
if ($allowedSubTypesList !== null) {
$allowedSubTypes = [];
foreach ($allowedSubTypesList as $allowedSubType) {
$allowedSubTypes[$allowedSubType->describe(VerbosityLevel::precise())] = $allowedSubType;
staabm marked this conversation as resolved.
Show resolved Hide resolved
}
$allowedSubTypes = $classReflection !== null ? $classReflection->getAllowedSubTypes() : null;
if ($allowedSubTypes !== null) {
$preciseVerbosity = VerbosityLevel::precise();

$originalAllowedSubTypes = $allowedSubTypes;
$subtractedSubTypes = [];

$subtractedTypesList = TypeUtils::flattenTypes($subtractedType);
$subtractedTypes = [];
foreach ($subtractedTypesList as $type) {
$subtractedTypes[$type->describe(VerbosityLevel::precise())] = $type;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we don't need the key of this array and building up the descriptions shows up in profiles of phpstan/phpstan#11263

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after getting rid of the key, it seems we can get rid of the whole loop

}

$subtractedTypes = TypeUtils::flattenTypes($subtractedType);
foreach ($subtractedTypes as $subType) {
foreach ($allowedSubTypes as $description => $allowedSubType) {
foreach ($allowedSubTypes as $key => $allowedSubType) {
if ($subType->equals($allowedSubType)) {
$description = $allowedSubType->describe($preciseVerbosity);
$subtractedSubTypes[$description] = $subType;
unset($allowedSubTypes[$description]);
unset($allowedSubTypes[$key]);
continue 2;
}
}
Expand Down
Loading