Skip to content

Tidy up RemoveFinfoBufferContextArgRector #7648

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
TomasVotruba merged 2 commits into from
Nov 20, 2025
Merged

Tidy up RemoveFinfoBufferContextArgRector #7648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0093f9c
bump phpstan rules
TomasVotruba Nov 20, 2025
a4c134d
tidy up RemoveFinfoBufferContextArgRector
TomasVotruba Nov 20, 2025
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"rector/type-perfect": "^2.1",
"shipmonk/composer-dependency-analyser": "^1.8",
"symplify/phpstan-extensions": "^12.0.2",
"symplify/phpstan-rules": "^14.8",
"symplify/phpstan-rules": "^14.8.4",
"symplify/vendor-patches": "^11.5",
"tomasvotruba/class-leak": "^2.0",
"tracy/tracy": "^2.11"
Expand Down
23 changes: 7 additions & 16 deletions rules/Php85/Rector/FuncCall/RemoveFinfoBufferContextArgRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
namespace Rector\Php85\Rector\FuncCall;

use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\CallLike;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Identifier;
Expand Down Expand Up @@ -58,6 +56,10 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if ($node->isFirstClassCallable()) {
return null;
}

if ($node instanceof FuncCall && ! $this->isName($node->name, 'finfo_buffer')) {
return null;
}
Expand All @@ -82,10 +84,7 @@ public function provideMinPhpVersion(): int
return PhpVersionFeature::DEPRECATE_FINFO_BUFFER_CONTEXT;
}

/**
* @param FuncCall|MethodCall $callLike
*/
private function removeContextArg(CallLike $callLike): bool
private function removeContextArg(FuncCall|MethodCall $callLike): bool
{
// In `finfo::buffer` method calls, the first parameter, compared to `finfo_buffer`, does not exist.
$methodArgCorrection = 0;
Expand All @@ -97,15 +96,7 @@ private function removeContextArg(CallLike $callLike): bool
return false;
}

// Cannot handle variadic args
foreach ($callLike->args as $position => $arg) {
if (! $arg instanceof Arg) {
return false;
}
}

/** @var array<Arg> $args */
$args = $callLike->args;
$args = $callLike->getArgs();

// Argument 3 ($flags) and argument 4 ($context) are optional, thus named parameters must be considered
if (! $this->argsAnalyzer->hasNamedArg($args)) {
Expand All @@ -119,7 +110,7 @@ private function removeContextArg(CallLike $callLike): bool
}

foreach ($args as $position => $arg) {
if ($arg->name instanceof Identifier && $arg->name->name === 'context') {
if ($arg->name instanceof Identifier && $this->isName($arg->name, 'context')) {
unset($callLike->args[$position]);

return true;
Expand Down