-
-
Notifications
You must be signed in to change notification settings - Fork 356
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.
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
Add "--only" option to process only a single rule #6441
Open
cweiske
wants to merge
1
commit into
rectorphp:main
Choose a base branch
from
mogic-le:cli-option-only-rule
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+338
−7
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
--only="Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"require": { | ||
"php": "^8.1" | ||
}, | ||
"minimum-stability": "dev", | ||
"prefer-stable": true | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
1 file with changes | ||
=================== | ||
|
||
1) src/MultiRules.php:9 | ||
|
||
---------- begin diff ---------- | ||
@@ @@ | ||
echo 'a statement'; | ||
} | ||
} | ||
- | ||
- private function notUsed() | ||
- { | ||
- } | ||
} | ||
----------- end diff ----------- | ||
|
||
Applied rules: | ||
* RemoveUnusedPrivateMethodRector | ||
|
||
|
||
[OK] 1 file would have been changed (dry-run) by Rector |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
use Rector\Config\RectorConfig; | ||
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; | ||
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; | ||
|
||
return static function (RectorConfig $rectorConfig): void { | ||
$rectorConfig->paths([ | ||
__DIR__ . '/src', | ||
]); | ||
|
||
$rectorConfig->rules([ | ||
RemoveAlwaysElseRector::class, | ||
RemoveUnusedPrivateMethodRector::class, | ||
]); | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?php | ||
|
||
final class MultiRules | ||
{ | ||
public function doSomething() | ||
{ | ||
if (true === false) { | ||
return -1; | ||
} else { | ||
echo 'a statement'; | ||
} | ||
} | ||
|
||
private function notUsed() | ||
{ | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<?php | ||
|
||
class RemoveAlwaysElse | ||
{ | ||
public function run($value) | ||
{ | ||
if ($value) { | ||
throw new \InvalidStateException; | ||
} else { | ||
return 10; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Rector\Configuration; | ||
|
||
use Rector\Contract\Rector\RectorInterface; | ||
use Rector\ValueObject\Configuration; | ||
|
||
/** | ||
* Modify available rector rules based on the configuration options | ||
*/ | ||
final class ConfigurationRuleFilter | ||
{ | ||
private ?Configuration $configuration = null; | ||
|
||
public function setConfiguration(Configuration $configuration): void | ||
{ | ||
$this->configuration = $configuration; | ||
} | ||
|
||
/** | ||
* @param array<RectorInterface> $rectors | ||
* @return array<RectorInterface> | ||
*/ | ||
public function filter(array $rectors): array | ||
{ | ||
if ($this->configuration === null) { | ||
return $rectors; | ||
} | ||
|
||
$onlyRule = $this->configuration->getOnlyRule(); | ||
if ($onlyRule !== null) { | ||
$rectors = $this->filterOnlyRule($rectors, $onlyRule); | ||
return $rectors; | ||
} | ||
|
||
return $rectors; | ||
} | ||
|
||
/** | ||
* @param array<RectorInterface> $rectors | ||
* @return array<RectorInterface> | ||
*/ | ||
public function filterOnlyRule(array $rectors, string $onlyRule): array | ||
{ | ||
$activeRectors = []; | ||
foreach ($rectors as $rector) { | ||
if (is_a($rector, $onlyRule)) { | ||
$activeRectors[] = $rector; | ||
} | ||
} | ||
|
||
return $activeRectors; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Rector\Configuration; | ||
|
||
use Rector\Contract\Rector\RectorInterface; | ||
use Rector\Exception\Configuration\RectorRuleNotFoundException; | ||
|
||
/** | ||
* @see \Rector\Tests\Configuration\OnlyRuleResolverTest | ||
*/ | ||
final class OnlyRuleResolver | ||
{ | ||
/** | ||
* @param RectorInterface[] $rectors | ||
*/ | ||
public function __construct( | ||
private readonly array $rectors | ||
) { | ||
} | ||
|
||
public function resolve(string $rule): string | ||
{ | ||
$rule = ltrim($rule, '\\'); | ||
|
||
foreach ($this->rectors as $rector) { | ||
if ($rector::class === $rule) { | ||
return $rule; | ||
} | ||
} | ||
|
||
if (strpos($rule, '\\') === false) { | ||
$message = sprintf( | ||
'Rule "%s" was not found.%sThe rule has no namespace - make sure to escape the backslashes correctly.', | ||
$rule, | ||
PHP_EOL | ||
); | ||
} else { | ||
$message = sprintf( | ||
'Rule "%s" was not found.%sMake sure it is registered in your config or in one of the sets', | ||
$rule, | ||
PHP_EOL | ||
); | ||
} | ||
throw new RectorRuleNotFoundException($message); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you also add single quotes and double slashes mix?
That's what caused troubles in past.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that should be equal https://3v4l.org/u19fl, but indeed needs verification as cli value maybe transform different