fix code review comments

phpstan · Jul 28, 2020 · a800264 · a800264
1 parent d686c82
commit a800264
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/rules.neon b/rules.neon
@@ -1,3 +1,11 @@
+conditionalTags:
+    PHPStan\Rules\PHPUnit\ShouldCallParentMethodsRule:
+        phpstan.rules.rule: %featureToggles.bleedingEdge%
+
+services:
+    -
+        class: PHPStan\Rules\PHPUnit\ShouldCallParentMethodsRule
+
 rules:
 	- PHPStan\Rules\PHPUnit\AssertSameBooleanExpectedRule
 	- PHPStan\Rules\PHPUnit\AssertSameNullExpectedRule

diff --git a/src/Rules/PHPUnit/ShouldCallParentMethodsRule.php b/src/Rules/PHPUnit/ShouldCallParentMethodsRule.php
@@ -21,9 +21,6 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		/** @var InClassMethodNode $node */
-		$node = $node;
-
 		if ($scope->getClassReflection() === null) {
 			return [];
 		}
@@ -42,16 +39,18 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (!in_array(strtolower($node->getOriginalNode()->name->name), ['setup', 'teardown'], true)) {
+		$methodName = $node->getOriginalNode()->name->name;
+
+		if (!in_array(strtolower($methodName), ['setup', 'teardown'], true)) {
 			return [];
 		}
 
-		$hasParentCall = $this->hasParentClassCall($node->getOriginalNode()->getStmts());
+		$hasParentCall = $this->hasParentClassCall($node->getOriginalNode()->getStmts(), strtolower($methodName));
 
 		if (!$hasParentCall) {
 			return [
 				RuleErrorBuilder::message(
-					sprintf('Missing call to parent::%s method.', $node->getOriginalNode()->name->name)
+					sprintf('Missing call to parent::%s() method.', $methodName)
 				)->build(),
 			];
 		}
@@ -61,10 +60,11 @@ public function processNode(Node $node, Scope $scope): array
 
 	/**
 	 * @param Node\Stmt[]|null $stmts
+	 * @param string           $methodName
 	 *
 	 * @return bool
 	 */
-	private function hasParentClassCall(?array $stmts): bool
+	private function hasParentClassCall(?array $stmts, string $methodName): bool
 	{
 		if ($stmts === null) {
 			return false;
@@ -93,7 +93,7 @@ private function hasParentClassCall(?array $stmts): bool
 				continue;
 			}
 
-			if (in_array(strtolower($stmt->expr->name->name), ['setup', 'teardown'], true)) {
+			if (strtolower($stmt->expr->name->name) === $methodName) {
 				return true;
 			}
 		}

diff --git a/tests/Rules/PHPUnit/ShouldCallParentMethodsRuleTest.php b/tests/Rules/PHPUnit/ShouldCallParentMethodsRuleTest.php
@@ -19,11 +19,14 @@ public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/missing-parent-method-calls.php'], [
 			[
-				'Missing call to parent::setUp method.',
+				'Missing call to parent::setUp() method.',
 				32,
+			],[
+				'Missing call to parent::setUp() method.',
+				55,
 			],
 			[
-				'Missing call to parent::tearDown method.',
+				'Missing call to parent::tearDown() method.',
 				63,
 			],
 		]);

diff --git a/tests/Rules/PHPUnit/data/missing-parent-method-calls.php b/tests/Rules/PHPUnit/data/missing-parent-method-calls.php
@@ -55,7 +55,7 @@ class FooBarBazTest extends BaseTestCase
 	public function setUp(): void
 	{
 		$result = 1 + 1;
-		parent::setUp();
+		parent::tearDown();
 
 		$this->fooBarBaz = $result;
 	}