Skip to content

add makeFinal() method to AbstractRector #1895

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 1 commit into from
Aug 25, 2019
Merged

add makeFinal() method to AbstractRector #1895

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion packages/SOLID/src/Rector/Class_/FinalizeClassesWithoutChildrenRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function refactor(Node $node): ?Node
return null;
}

$node->flags |= Class_::MODIFIER_FINAL;
$this->makeFinal($node);

return $node;
}
Expand Down
14 changes: 13 additions & 1 deletion src/PhpParser/Node/Manipulator/VisibilityManipulator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,22 @@ public function makeAbstract(Node $node): void
$this->addVisibilityFlag($node, 'abstract');
}

/**
* @param Class_|ClassMethod $node
*/
public function makeFinal(Node $node): void
{
$this->addVisibilityFlag($node, 'final');
}

/**
* @param ClassMethod|Property|ClassConst $node
*/
public function replaceVisibilityFlag(Node $node, string $visibility): void
{
$visibility = strtolower($visibility);

if ($visibility !== 'static' && $visibility !== 'abstract') {
if ($visibility !== 'static' && $visibility !== 'abstract' && $visibility !== 'final') {
$this->removeOriginalVisibilityFromFlags($node);
}

Expand Down Expand Up @@ -99,6 +107,10 @@ private function addVisibilityFlag(Node $node, string $visibility): void
if ($visibility === 'abstract') {
$node->flags |= Class_::MODIFIER_ABSTRACT;
}

if ($visibility === 'final') {
$node->flags |= Class_::MODIFIER_FINAL;
}
}

private function ensureIsClassMethodOrProperty(Node $node, string $location): void
Expand Down
5 changes: 5 additions & 0 deletions src/Rector/AbstractRector/VisibilityTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,9 @@ public function makeStatic(Node $node): void
{
$this->visibilityManipulator->makeStatic($node);
}

public function makeFinal(Class_ $class): void
{
$this->visibilityManipulator->makeFinal($class);
}
}
11 changes: 5 additions & 6 deletions utils/Composer/bin/SortNamespaces.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
ksort($jsonContent['autoload-dev']['psr-4']);

// 3. make core first
$jsonContent['autoload']['psr-4'] = array_merge(
['Rector\\' => 'src'],
$jsonContent['autoload']['psr-4']
);
$jsonContent['autoload']['psr-4'] = array_merge(['Rector\\' => 'src'], $jsonContent['autoload']['psr-4']);
$jsonContent['autoload-dev']['psr-4'] = array_merge(
['Rector\\Tests\\' => 'tests'],
$jsonContent['autoload-dev']['psr-4']
Expand All @@ -39,7 +36,8 @@


// used from: https://github.com/Symplify/Symplify/blob/64e1e07c87b1ec5551df07482d68c5085e76824a/packages/MonorepoBuilder/src/FileSystem/JsonFileManager.php#L70
function inlineSections(string $jsonContent, array $inlineSections): string {
function inlineSections(string $jsonContent, array $inlineSections): string
{
foreach ($inlineSections as $inlineSection) {
$pattern = '#("' . preg_quote($inlineSection, '#') . '": )\[(.*?)\](,)#ms';
$jsonContent = Strings::replace($jsonContent, $pattern, function (array $match): string {
Expand All @@ -54,7 +52,8 @@ function inlineSections(string $jsonContent, array $inlineSections): string {
return $jsonContent;
}

function inlineAuthorSection(string $jsonContent): string {
function inlineAuthorSection(string $jsonContent): string
{
$authorsPattern = '#("authors":\s+\[)(?<authors>.*?)(\])#s';

$match = Strings::match($jsonContent, $authorsPattern);
Expand Down