From b1e555acd333e535fd9e8ab4c3997f2a0580aa22 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 27 Aug 2024 15:13:19 +0200 Subject: [PATCH] cleanup --- .../Levels/LevelRulesResolver.php | 2 +- src/Configuration/RectorConfigBuilder.php | 23 ++++--------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/Configuration/Levels/LevelRulesResolver.php b/src/Configuration/Levels/LevelRulesResolver.php index 8409f297e3..84aea2909b 100644 --- a/src/Configuration/Levels/LevelRulesResolver.php +++ b/src/Configuration/Levels/LevelRulesResolver.php @@ -23,7 +23,7 @@ public static function resolve(int $level, array $availableRules, string $method if ($availableRules === []) { throw new ShouldNotHappenException(sprintf( - 'There is no available rules in %s, define the available rules first', + 'There are no available rules in "%s()", define the available rules first', $methodName )); } diff --git a/src/Configuration/RectorConfigBuilder.php b/src/Configuration/RectorConfigBuilder.php index 4065f3afea..f460d994a9 100644 --- a/src/Configuration/RectorConfigBuilder.php +++ b/src/Configuration/RectorConfigBuilder.php @@ -654,7 +654,7 @@ public function withPreparedSets( bool $twig = false, bool $phpunit = false, ): self { - Notifier::notifyNotSuitableMethodForPHP74(__METHOD__); + Notifier::notifyNotSuitableMethodForPHP74(__METHOD__ . '()'); if ($deadCode) { $this->sets[] = SetList::DEAD_CODE; @@ -892,11 +892,7 @@ public function withDeadCodeLevel(int $level): self { $this->isDeadCodeLevelUsed = true; - $levelRules = LevelRulesResolver::resolve( - $level, - DeadCodeLevel::RULES, - 'RectorConfig::' . __METHOD__ . '()' - ); + $levelRules = LevelRulesResolver::resolve($level, DeadCodeLevel::RULES, __METHOD__); $this->rules = array_merge($this->rules, $levelRules); @@ -911,11 +907,7 @@ public function withTypeCoverageLevel(int $level): self { $this->isTypeCoverageLevelUsed = true; - $levelRules = LevelRulesResolver::resolve( - $level, - TypeDeclarationLevel::RULES, - 'RectorConfig::' . __METHOD__ . '()' - ); + $levelRules = LevelRulesResolver::resolve($level, TypeDeclarationLevel::RULES, __METHOD__); $this->rules = array_merge($this->rules, $levelRules); @@ -934,9 +926,8 @@ public function withPhpLevel(int $level): self $setRectorsResolver = new SetRectorsResolver(); $phpRectorRules = $setRectorsResolver->resolveFromFilePathForPhpLevel($phpLevelSetFilePath); - $levelRules = LevelRulesResolver::resolve($level, $phpRectorRules, 'RectorConfig::' . __METHOD__); + $levelRules = LevelRulesResolver::resolve($level, $phpRectorRules, __METHOD__); - // @todo this method conflicts with withPhpSets(), withPhpX(...) $this->rules = array_merge($this->rules, $levelRules); return $this; @@ -950,11 +941,7 @@ public function withCodeQualityLevel(int $level): self { $this->isCodeQualityLevelUsed = true; - $levelRules = LevelRulesResolver::resolve( - $level, - CodeQualityLevel::RULES, - 'RectorConfig::' . __METHOD__ . '()' - ); + $levelRules = LevelRulesResolver::resolve($level, CodeQualityLevel::RULES, __METHOD__); $this->rules = array_merge($this->rules, $levelRules);