Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use PHPStan\Reflection\ClassReflection;
use PHPStan\Type\ObjectType;
use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
use Rector\Php81\NodeManipulator\AttributeGroupNewLiner;
use Rector\PHPStan\ScopeFetcher;
use Rector\Privatization\NodeManipulator\VisibilityManipulator;
use RectorLaravel\AbstractRector;
Expand All @@ -24,8 +23,7 @@ class MakeModelAttributesAndScopesProtectedRector extends AbstractRector
{
public function __construct(
private readonly VisibilityManipulator $visibilityManipulator,
private readonly PhpAttributeAnalyzer $phpAttributeAnalyzer,
private readonly AttributeGroupNewLiner $attributeGroupNewLiner,
private readonly PhpAttributeAnalyzer $phpAttributeAnalyzer
) {}

public function getRuleDefinition(): RuleDefinition
Expand Down Expand Up @@ -90,10 +88,6 @@ public function refactor(Node $node): ?Node

$this->visibilityManipulator->makeProtected($node);

if ($node->attrGroups !== []) {
$this->attributeGroupNewLiner->newLine($this->file, $node);
}

return $node;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ private function handleBinaryOp(BinaryOp $binaryOp): array
$methodCall = array_values(
array_filter(
[$binaryOp->left, $binaryOp->right],
fn ($node) => $this->validMethodCall($node),
$this->validMethodCall(...),
)
)[0] ?? null;

Expand Down