[BE] New better NoopRule

Author: ondrejmirtes

changelog-2.0.md

@@ -70,7 +70,6 @@ Bleeding edge (TODO move to other sections)
 * Rule for `call_user_func()` ([#2479](https://github.com/phpstan/phpstan-src/pull/2479)), thanks @staabm!
 * MagicConstantContextRule ([#2741](https://github.com/phpstan/phpstan-src/pull/2741)), #10099, thanks @staabm!
 * TooWideMethodReturnTypehintRule - always report for final methods (https://github.com/phpstan/phpstan-src/commit/c30e9a484c8245b8126cd63444607ca74d2af761)
-* NoopRule - report top-level `xor` because that's probably not what the user intended to do (https://github.com/phpstan/phpstan-src/commit/a1fffb3346e09f1e8e8d987d4282263295a55142), #10267
 * Report unused results of `and` and `or` (https://github.com/phpstan/phpstan-src/commit/1d8fff637d70a9e9ed3f11dee5d61b9f796cbf1a)
 * Report unused result of ternary (https://github.com/phpstan/phpstan-src/commit/9664f7a9d2223c07e750f0dfc949c3accfa6b65e)
 * Report unused results of `&&` and `||` (https://github.com/phpstan/phpstan-src/commit/cf2c8bbd9ebd2ebe300dbd310e136ad603d7def3)
@@ -83,7 +82,6 @@ Bleeding edge (TODO move to other sections)
     * [#3020](https://github.com/phpstan/phpstan-src/pull/3020), thanks @staabm!
     * [#3022](https://github.com/phpstan/phpstan-src/pull/3022), thanks @staabm!
     * [#3023](https://github.com/phpstan/phpstan-src/pull/3023), thanks @staabm!
-* BetterNoopRule - take advantage of impure points (https://github.com/phpstan/phpstan-src/commit/a6470521b65d7424f552633c1f3827704c6262c3), #10389
 * CallToConstructorStatementWithoutSideEffectsRule - report class with no constructor (https://github.com/phpstan/phpstan-src/commit/b116d25a6e4ba6c09f59af6569d9e6f6fd20aff4)
 * Check if required file exists ([#3294](https://github.com/phpstan/phpstan-src/pull/3294)), #3397, thanks @Bellangelo!
 * Enforce `@no-named-arguments` (https://github.com/phpstan/phpstan-src/commit/74ba8c23696948f2647d880df72f375346f41010), #5968
@@ -128,6 +126,7 @@ Improvements 🔧
 * Check mixed in binary operator ([#3231](https://github.com/phpstan/phpstan-src/pull/3231)), #7538, #10440, thanks @schlndh!
 * Check mixed in unary operator ([#3253](https://github.com/phpstan/phpstan-src/pull/3253)), thanks @schlndh!
 * Stub files validation - detect duplicate classes and functions (https://github.com/phpstan/phpstan-src/commit/ddf8d5c3859c2c75c20f525a0e2ca8b99032373a, https://github.com/phpstan/phpstan-src/commit/17e4b74335e5235d7cd6708eb687a774a0eeead4)
+* NoopRule - take advantage of impure points (https://github.com/phpstan/phpstan-src/commit/a6470521b65d7424f552633c1f3827704c6262c3), #10389
 
 Bugfixes 🐛
 =====================

conf/bleedingEdge.neon

@@ -22,7 +22,6 @@ parameters:
 		nullContextForVoidReturningFunctions: true
 		unescapeStrings: true
 		alwaysCheckTooWideReturnTypeFinalMethods: true
-		betterNoop: true
 		alwaysTrueAlwaysReported: true
 		disableUnreachableBranchesRules: true
 		varTagType: true

conf/config.level4.neon

@@ -3,6 +3,7 @@ includes:
 
 rules:
 	- PHPStan\Rules\Arrays\DeadForeachRule
+	- PHPStan\Rules\DeadCode\NoopRule
 	- PHPStan\Rules\DeadCode\UnreachableStatementRule
 	- PHPStan\Rules\DeadCode\UnusedPrivateConstantRule
 	- PHPStan\Rules\DeadCode\UnusedPrivateMethodRule
@@ -26,8 +27,6 @@ conditionalTags:
 		phpstan.collector: %featureToggles.notAnalysedTrait%
 	PHPStan\Rules\Traits\NotAnalysedTraitRule:
 		phpstan.rules.rule: %featureToggles.notAnalysedTrait%
-	PHPStan\Rules\DeadCode\BetterNoopRule:
-		phpstan.rules.rule: %featureToggles.betterNoop%
 	PHPStan\Rules\DeadCode\CallToConstructorStatementWithoutImpurePointsRule:
 		phpstan.rules.rule: %featureToggles.pure%
 	PHPStan\Rules\DeadCode\PossiblyPureNewCollector:
@@ -200,9 +199,6 @@ services:
 		tags:
 			- phpstan.rules.rule
 
-	-
-		class: PHPStan\Rules\DeadCode\BetterNoopRule
-
 	-
 		class: PHPStan\Rules\Comparison\MatchExpressionRule
 		arguments:

conf/config.neon

@@ -43,14 +43,12 @@ parameters:
 		nullContextForVoidReturningFunctions: false
 		unescapeStrings: false
 		alwaysCheckTooWideReturnTypeFinalMethods: false
-		betterNoop: false
 		alwaysTrueAlwaysReported: false
 		disableUnreachableBranchesRules: false
 		varTagType: false
 		closureDefaultParameterTypeRule: false
 		instanceofType: false
 		paramOutVariance: false
-
 		strictStaticMethodTemplateTypeVariance: false
 		propertyVariance: false
 		stricterFunctionMap: false

conf/parametersSchema.neon

@@ -49,7 +49,6 @@ parametersSchema:
 		nullContextForVoidReturningFunctions: bool()
 		unescapeStrings: bool()
 		alwaysCheckTooWideReturnTypeFinalMethods: bool()
-		betterNoop: bool()
 		alwaysTrueAlwaysReported: bool()
 		disableUnreachableBranchesRules: bool()
 		varTagType: bool()

src/Rules/DeadCode/BetterNoopRule.php renamed to src/Rules/DeadCode/NoopRule.php

@@ -15,7 +15,7 @@
 /**
  * @implements Rule<NoopExpressionNode>
  */
-final class BetterNoopRule implements Rule
+final class NoopRule implements Rule
 {
 
 	public function __construct(private ExprPrinter $exprPrinter)

tests/PHPStan/Rules/DeadCode/BetterNoopRuleTest.php renamed to tests/PHPStan/Rules/DeadCode/NoopRuleTest.php

@@ -8,14 +8,14 @@
 use PHPStan\Testing\RuleTestCase;
 
 /**
- * @extends RuleTestCase<BetterNoopRule>
+ * @extends RuleTestCase<NoopRule>
  */
-class BetterNoopRuleTest extends RuleTestCase
+class NoopRuleTest extends RuleTestCase
 {
 
 	protected function getRule(): Rule
 	{
-		return new BetterNoopRule(new ExprPrinter(new Printer()));
+		return new NoopRule(new ExprPrinter(new Printer()));
 	}
 
 	public function testRule(): void