fixup! Add MemoizationPropertyRule

Author: zonuexe

build/PHPStan/Build/MemoizationPropertyRule.php

@@ -15,7 +15,6 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\If_;
-use PhpParser\Node\Stmt\Return_;
 use PhpParser\Node\VarLikeIdentifier;
 use PHPStan\Analyser\Scope;
 use PHPStan\File\FileHelper;
@@ -25,12 +24,11 @@
 use function count;
 use function dirname;
 use function is_string;
-use function sprintf;
 use function str_starts_with;
 use function strcasecmp;
 
 /**
- * @implements Rule<InClassMethodNode>
+ * @implements Rule<If_>
  */
 final class MemoizationPropertyRule implements Rule
 {
@@ -41,28 +39,14 @@ public function __construct(private FileHelper $fileHelper, private bool $skipTe
 
 	public function getNodeType(): string
 	{
-		return InClassMethodNode::class;
+		return If_::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		$methodNode = $node->getOriginalNode();
-		if (count($methodNode->params) !== 0) {
-			return [];
-		}
-
-		$stmts = $methodNode->getStmts();
-		if ($stmts === null || count($stmts) !== 2) {
-			return [];
-		}
+		$ifNode = $node;
 
-		[$ifNode, $returnNode] = $stmts;
-		if (!$returnNode instanceof Return_ || !$this->isSupportedFetchNode($returnNode->expr)) {
-			return [];
-		}
-
-		if (!$ifNode instanceof If_
-			|| count($ifNode->stmts) !== 1
+		if (count($ifNode->stmts) !== 1
 			|| !$ifNode->stmts[0] instanceof Expression
 			|| count($ifNode->elseifs) !== 0
 			|| $ifNode->else !== null
@@ -79,33 +63,17 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if ($this->areNodesNotEqual($returnNode->expr, [$ifNode->cond->left, $ifThenNode->var])) {
+		if ($this->skipTests && str_starts_with($this->fileHelper->normalizePath($scope->getFile()), $this->fileHelper->normalizePath(dirname(__DIR__, 3) . '/tests'))) {
 			return [];
 		}
 
-		if ($this->skipTests && str_starts_with($this->fileHelper->normalizePath($scope->getFile()), $this->fileHelper->normalizePath(dirname(__DIR__, 3) . '/tests'))) {
+		if ($this->areNodesNotEqual($ifNode->cond->left, [$ifThenNode->var])) {
 			return [];
 		}
 
-		$classReflection = $node->getClassReflection();
-		$methodReflection = $node->getMethodReflection();
-		$methodName = $methodNode->name->name;
-		$errorBuilder = RuleErrorBuilder::message(
-			sprintf(
-				'%s %s::%s() for memoization can be simplified.',
-				$methodReflection->isStatic() ? 'Static method' : 'Method',
-				$classReflection->getDisplayName(),
-				$methodName,
-			),
-		)->fixNode($node->getOriginalNode(), static function (Node\Stmt\ClassMethod $method) use ($ifThenNode) {
-			$method->stmts = [
-				new Return_(
-					new Coalesce($ifThenNode->var, $ifThenNode->expr),
-				),
-			];
-
-			return $method;
-		})->identifier('phpstan.memoizationProperty');
+		$errorBuilder = RuleErrorBuilder::message('Memoization property can be simplified.')
+			->fixNode($node, static fn (If_ $node) => new Expression(new Coalesce($ifThenNode->var, $ifThenNode->expr)))
+			->identifier('phpstan.memoizationProperty');
 
 		return [
 			$errorBuilder->build(),

tests/PHPStan/Build/MemoizationPropertyRuleTest.php

@@ -22,15 +22,23 @@ public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/memoization-property.php'], [
 			[
-				'Method MemoizationProperty\A::getFoo() for memoization can be simplified.',
-				11,
+				'Memoization property can be simplified.',
+				13,
 			],
 			[
-				'Method MemoizationProperty\A::getBar() for memoization can be simplified.',
-				20,
+				'Memoization property can be simplified.',
+				22,
 			],
 			[
-				'Static method MemoizationProperty\A::singleton() for memoization can be simplified.',
+				'Memoization property can be simplified.',
+				55,
+			],
+			[
+				'Memoization property can be simplified.',
+				85,
+			],
+			[
+				'Memoization property can be simplified.',
 				96,
 			],
 		]);

tests/PHPStan/Build/data/memoization-property.php

@@ -50,7 +50,6 @@ public function getBarElseIf()
 		return $this->bar;
 	}
 
-	/** Not applicable because it receives parameters. */
 	public function getBarReceiveParam(int $length)
 	{
 		if ($this->bar === null) {
@@ -81,7 +80,6 @@ public function getBuz()
 		return $this->buz;
 	}
 
-	/** Not applicable because it doesn't return a memoized property. */
 	public function printFoo(): void
 	{
 		if ($this->foo === null) {

tests/PHPStan/Build/data/memoization-property.php.fixed

@@ -10,12 +10,16 @@ final class A
 
 	public function getFoo()
 	{
-		return $this->foo ??= random_bytes(1);
+		$this->foo ??= random_bytes(1);
+
+		return $this->foo;
 	}
 
 	public function getBar()
 	{
-		return $this->bar ??= random_bytes(1);
+		$this->bar ??= random_bytes(1);
+
+		return $this->bar;
 	}
 
 	/** Not applicable because it has an else clause in the if. */
@@ -42,12 +46,9 @@ final class A
 		return $this->bar;
 	}
 
-	/** Not applicable because it receives parameters. */
 	public function getBarReceiveParam(int $length)
 	{
-		if ($this->bar === null) {
-			$this->bar = random_bytes($length);
-		}
+		$this->bar ??= random_bytes($length);
 
 		return $this->bar;
 	}
@@ -73,12 +74,9 @@ final class A
 		return $this->buz;
 	}
 
-	/** Not applicable because it doesn't return a memoized property. */
 	public function printFoo(): void
 	{
-		if ($this->foo === null) {
-			$this->foo = random_bytes(1);
-		}
+		$this->foo ??= random_bytes(1);
 
 		echo $this->foo;
 	}
@@ -87,7 +85,9 @@ final class A
 
 	public static function singleton(): self
 	{
-		return self::$singleton ??= new self();
+		self::$singleton ??= new self();
+
+		return self::$singleton;
 	}
 
 	/** Not applicable because property names are not matched. */