Skip to content

Keep the class body in its existing order when merging #164

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

Merged
ondrejmirtes merged 1 commit into from
Sep 10, 2026
Merged

Keep the class body in its existing order when merging #164

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
92 changes: 70 additions & 22 deletions extractor/extract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,43 +463,91 @@ private function compareStatementsInNamespace(array $oldStmts, array $newStmts,
}
}

$newStmtsToSet = $untouchedStmts;
// the class body keeps the order it already has. Rebuilding it by category moves
// every member that has aged out of the version window to the top of the class, which
// makes each update churn files that did not really change.
$untouchedIds = [];
foreach ($untouchedStmts as $stmt) {
$untouchedIds[spl_object_id($stmt)] = true;
}

$newMethodsByName = [];
foreach ($newMethods as $stmt) {
$methodName = $stmt->name->toLowerString();
if (!array_key_exists($methodName, $oldMethods)) {
$stmt->attrGroups[] = new Node\AttributeGroup([
new Node\Attribute(
new Node\Name\FullyQualified('Since'),
[new Node\Arg(new Node\Scalar\String_($updateTo))],
),
]);
$newMethodsByName[$stmt->name->toLowerString()] = $stmt;
}

$newConstantsByName = [];
foreach ($newConstants as $stmt) {
$namesKey = implode(',', array_map(static fn (Node\Const_ $const) => $const->name->toString(), $stmt->consts));
$newConstantsByName[$namesKey] = $stmt;
}

$newStmtsToSet = [];
$takenMethods = [];
$takenConstants = [];
foreach ($old->stmts as $stmt) {
if (array_key_exists(spl_object_id($stmt), $untouchedIds)) {
$newStmtsToSet[] = $stmt;
continue;
}

foreach ($this->compareFunctions($oldMethods[$methodName], $stmt, $updateTo) as $functionStmt) {
$newStmtsToSet[] = $functionStmt;
if ($stmt instanceof Node\Stmt\ClassMethod) {
$methodName = $stmt->name->toLowerString();
if (!array_key_exists($methodName, $newMethodsByName)) {
continue;
}

$takenMethods[$methodName] = true;
foreach ($this->compareFunctions($stmt, $newMethodsByName[$methodName], $updateTo) as $functionStmt) {
$newStmtsToSet[] = $functionStmt;
}

continue;
}

if ($stmt instanceof Node\Stmt\ClassConst) {
$namesKey = implode(',', array_map(static fn (Node\Const_ $const) => $const->name->toString(), $stmt->consts));
if (!array_key_exists($namesKey, $newConstantsByName)) {
continue;
}

$takenConstants[$namesKey] = true;
foreach ($this->compareConstants($stmt, $newConstantsByName[$namesKey], $updateTo) as $constantStmt) {
$newStmtsToSet[] = $constantStmt;
}
}
}

// whatever the new version adds goes after what is already there
foreach ($newMethods as $stmt) {
if (array_key_exists($stmt->name->toLowerString(), $takenMethods)) {
continue;
}

$stmt->attrGroups[] = new Node\AttributeGroup([
new Node\Attribute(
new Node\Name\FullyQualified('Since'),
[new Node\Arg(new Node\Scalar\String_($updateTo))],
),
]);
$newStmtsToSet[] = $stmt;
}

// todo has a method been removed?

foreach ($newConstants as $stmt) {
$namesKey = implode(',', array_map(static fn (Node\Const_ $const) => $const->name->toString(), $stmt->consts));
if (!array_key_exists($namesKey, $oldConstants)) {
$stmt->attrGroups[] = new Node\AttributeGroup([
new Node\Attribute(
new Node\Name\FullyQualified('Since'),
[new Node\Arg(new Node\Scalar\String_($updateTo))],
),
]);
$newStmtsToSet[] = $stmt;
if (array_key_exists($namesKey, $takenConstants)) {
continue;
}

foreach ($this->compareConstants($oldConstants[$namesKey], $stmt, $updateTo) as $constantStmt) {
$newStmtsToSet[] = $constantStmt;
}
$stmt->attrGroups[] = new Node\AttributeGroup([
new Node\Attribute(
new Node\Name\FullyQualified('Since'),
[new Node\Arg(new Node\Scalar\String_($updateTo))],
),
]);
$newStmtsToSet[] = $stmt;
}

// todo has a constant been removed?
Expand Down
Loading