Rewrite in backward compatibility compliant way

ondrejmirtes · ondrejmirtes · commit 63cec251637e · 2021-06-09T15:42:17.000+02:00
diff --git a/tests/Rules/BooleansInConditions/BooleanInBooleanAndRuleTest.php b/tests/Rules/BooleansInConditions/BooleanInBooleanAndRuleTest.php
@@ -15,12 +15,7 @@ protected function getRule(): Rule
 	{
 		return new BooleanInBooleanAndRule(
 			new BooleanRuleHelper(
-				new RuleLevelHelper(
-					$this->createBroker(),
-					true,
-					false,
-					true
-				)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			),
 			true
 		);
diff --git a/tests/Rules/BooleansInConditions/BooleanInBooleanNotRuleTest.php b/tests/Rules/BooleansInConditions/BooleanInBooleanNotRuleTest.php
@@ -12,12 +12,7 @@ protected function getRule(): Rule
 	{
 		return new BooleanInBooleanNotRule(
 			new BooleanRuleHelper(
-				new RuleLevelHelper(
-					$this->createBroker(),
-					true,
-					false,
-					true
-				)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/BooleansInConditions/BooleanInBooleanOrRuleTest.php b/tests/Rules/BooleansInConditions/BooleanInBooleanOrRuleTest.php
@@ -15,12 +15,7 @@ protected function getRule(): Rule
 	{
 		return new BooleanInBooleanOrRule(
 			new BooleanRuleHelper(
-				new RuleLevelHelper(
-					$this->createBroker(),
-					true,
-					false,
-					true
-				)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			),
 			true
 		);
diff --git a/tests/Rules/BooleansInConditions/BooleanInElseIfConditionRuleTest.php b/tests/Rules/BooleansInConditions/BooleanInElseIfConditionRuleTest.php
@@ -12,12 +12,7 @@ protected function getRule(): Rule
 	{
 		return new BooleanInElseIfConditionRule(
 			new BooleanRuleHelper(
-				new RuleLevelHelper(
-					$this->createBroker(),
-					true,
-					false,
-					true
-				)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/BooleansInConditions/BooleanInIfConditionRuleTest.php b/tests/Rules/BooleansInConditions/BooleanInIfConditionRuleTest.php
@@ -12,12 +12,7 @@ protected function getRule(): Rule
 	{
 		return new BooleanInIfConditionRule(
 			new BooleanRuleHelper(
-				new RuleLevelHelper(
-					$this->createBroker(),
-					true,
-					false,
-					true
-				)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/BooleansInConditions/BooleanInTernaryOperatorRuleTest.php b/tests/Rules/BooleansInConditions/BooleanInTernaryOperatorRuleTest.php
@@ -12,12 +12,7 @@ protected function getRule(): Rule
 	{
 		return new BooleanInTernaryOperatorRule(
 			new BooleanRuleHelper(
-				new RuleLevelHelper(
-					$this->createBroker(),
-					true,
-					false,
-					true
-				)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/Operators/OperandInArithmeticIncrementOrDecrementRuleTest.php b/tests/Rules/Operators/OperandInArithmeticIncrementOrDecrementRuleTest.php
@@ -12,7 +12,7 @@ protected function getRule(): Rule
 	{
 		return $this->createRule(
 			new OperatorRuleHelper(
-				new RuleLevelHelper($this->createBroker(), true, false, true)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticAdditionRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticAdditionRuleTest.php
@@ -13,7 +13,7 @@ protected function getRule(): Rule
 	{
 		return new OperandsInArithmeticAdditionRule(
 			new OperatorRuleHelper(
-				new RuleLevelHelper($this->createBroker(), true, false, true)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticDivisionRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticDivisionRuleTest.php
@@ -12,7 +12,7 @@ protected function getRule(): Rule
 	{
 		return new OperandsInArithmeticDivisionRule(
 			new OperatorRuleHelper(
-				new RuleLevelHelper($this->createBroker(), true, false, true)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticExponentiationRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticExponentiationRuleTest.php
@@ -12,7 +12,7 @@ protected function getRule(): Rule
 	{
 		return new OperandsInArithmeticExponentiationRule(
 			new OperatorRuleHelper(
-				new RuleLevelHelper($this->createBroker(), true, false, true)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticModuloRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticModuloRuleTest.php
@@ -12,7 +12,7 @@ protected function getRule(): Rule
 	{
 		return new OperandsInArithmeticModuloRule(
 			new OperatorRuleHelper(
-				new RuleLevelHelper($this->createBroker(), true, false, true)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticMultiplicationRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticMultiplicationRuleTest.php
@@ -12,7 +12,7 @@ protected function getRule(): Rule
 	{
 		return new OperandsInArithmeticMultiplicationRule(
 			new OperatorRuleHelper(
-				new RuleLevelHelper($this->createBroker(), true, false, true)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/Operators/OperandsInArithmeticSubtractionRuleTest.php b/tests/Rules/Operators/OperandsInArithmeticSubtractionRuleTest.php
@@ -12,7 +12,7 @@ protected function getRule(): Rule
 	{
 		return new OperandsInArithmeticSubtractionRule(
 			new OperatorRuleHelper(
-				new RuleLevelHelper($this->createBroker(), true, false, true)
+				self::getContainer()->getByType(RuleLevelHelper::class)
 			)
 		);
 	}
diff --git a/tests/Rules/StrictCalls/DynamicCallOnStaticMethodsRuleTest.php b/tests/Rules/StrictCalls/DynamicCallOnStaticMethodsRuleTest.php
@@ -8,19 +8,13 @@
 class DynamicCallOnStaticMethodsRuleTest extends \PHPStan\Testing\RuleTestCase
 {
 
-	/** @var bool */
-	private $checkThisOnly;
-
 	protected function getRule(): Rule
 	{
-		$broker = $this->createBroker();
-		$ruleLevelHelper = new RuleLevelHelper($broker, true, $this->checkThisOnly, true);
-		return new DynamicCallOnStaticMethodsRule($ruleLevelHelper);
+		return new DynamicCallOnStaticMethodsRule(self::getContainer()->getByType(RuleLevelHelper::class));
 	}
 
 	public function testRule(): void
 	{
-		$this->checkThisOnly = false;
 		$this->analyse([__DIR__ . '/data/dynamic-calls-on-static-methods.php'], [
 			[
 				'Dynamic call to static method StrictCalls\ClassWithStaticMethod::foo().',
@@ -41,19 +35,4 @@ public function testRule(): void
 		]);
 	}
 
-	public function testRuleOnThisOnly(): void
-	{
-		$this->checkThisOnly = true;
-		$this->analyse([__DIR__ . '/data/dynamic-calls-on-static-methods.php'], [
-			[
-				'Dynamic call to static method StrictCalls\ClassWithStaticMethod::foo().',
-				14,
-			],
-			[
-				'Dynamic call to static method StrictCalls\ClassUsingTrait::foo().',
-				34,
-			],
-		]);
-	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,7 @@ protected function getRule(): Rule`
`12`	`12`	`{`
`13`	`13`	`return new BooleanInBooleanNotRule(`
`14`	`14`	`new BooleanRuleHelper(`
`15`		`- new RuleLevelHelper(`
`16`		`- $this->createBroker(),`
`17`		`- true,`
`18`		`- false,`
`19`		`- true`
`20`		`- )`
	`15`	`+ self::getContainer()->getByType(RuleLevelHelper::class)`
`21`	`16`	`)`
`22`	`17`	`);`
`23`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ protected function getRule(): Rule`
`12`	`12`	`{`
`13`	`13`	`return $this->createRule(`
`14`	`14`	`new OperatorRuleHelper(`
`15`		`- new RuleLevelHelper($this->createBroker(), true, false, true)`
	`15`	`+ self::getContainer()->getByType(RuleLevelHelper::class)`
`16`	`16`	`)`
`17`	`17`	`);`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ protected function getRule(): Rule`
`13`	`13`	`{`
`14`	`14`	`return new OperandsInArithmeticAdditionRule(`
`15`	`15`	`new OperatorRuleHelper(`
`16`		`- new RuleLevelHelper($this->createBroker(), true, false, true)`
	`16`	`+ self::getContainer()->getByType(RuleLevelHelper::class)`
`17`	`17`	`)`
`18`	`18`	`);`
`19`	`19`	`}`