Skip to content

Fix: Extractor not detecting class-level attribute changes #139

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

Closed
wants to merge 1 commit into from
Closed

Fix: Extractor not detecting class-level attribute changes #139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 71 additions & 0 deletions extractor/extract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,11 @@ private function compareStatementsInNamespace(array $oldStmts, array $newStmts,

// todo has a constant been removed?

// Compare class-level attributes
if ($this->hasAttributeChanges($old, $new)) {
return $this->stmtDiff($old, $new, $updateTo);
}

$old->stmts = $newStmtsToSet;

return [$old];
Expand Down Expand Up @@ -691,6 +696,72 @@ private function stmtDiff(Node $old, Node $new, string $updateTo): array
return [$old, $new];
}

/**
* Check if class-level attributes have changed between old and new class declarations.
* @param Node\Stmt\ClassLike $old
* @param Node\Stmt\ClassLike $new
* @return bool
*/
private function hasAttributeChanges(Node\Stmt\ClassLike $old, Node\Stmt\ClassLike $new): bool
{
$oldAttribGroups = $old->attrGroups;
$oldAttribs = [];
foreach ($oldAttribGroups as $group) {
foreach ($group->attrs as $attrib) {
if ($attrib->name->toLowerString() !== 'since' && $attrib->name->toLowerString() !== 'until') {
$oldAttribs[] = $attrib;
}
}
}

$newAttribGroups = $new->attrGroups;
$newAttribs = [];
foreach ($newAttribGroups as $group) {
foreach ($group->attrs as $attrib) {
if ($attrib->name->toLowerString() !== 'since' && $attrib->name->toLowerString() !== 'until') {
$newAttribs[] = $attrib;
}
}
}

if (count($oldAttribs) !== count($newAttribs)) {
return true;
}

foreach ($oldAttribs as $idx => $oldAttrib) {
$newAttrib = $newAttribs[$idx];
if ($oldAttrib->name->name !== $newAttrib->name->name) {
return true;
}

$oldArgs = $oldAttrib->args;
$newArgs = $newAttrib->args;
if (count($oldArgs) !== count($newArgs)) {
return true;
}

foreach ($oldArgs as $argIdx => $oldArg) {
$newArg = $newArgs[$argIdx];
if ($oldArg->name !== null && $newArg->name !== null) {
if ($oldArg->name->name !== $newArg->name->name) {
return true;
}
} elseif ($oldArg->name !== null || $newArg->name !== null) {
return true;
}

// Compare attribute argument values
$oldArgValue = $this->printer->prettyPrintExpr($oldArg->value);
$newArgValue = $this->printer->prettyPrintExpr($newArg->value);
if ($oldArgValue !== $newArgValue) {
return true;
}
}
}

return false;
}

/**
* @return Node\Stmt\ClassConst[]
*/
Expand Down