More correct analysis of DuplicateKeysInLiteralArraysRule with virtual nodes

ondrejmirtes · ondrejmirtes · commit ccc4f8547486 · 2019-03-14T15:46:15.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -47,6 +47,8 @@
 use PHPStan\Broker\Broker;
 use PHPStan\File\FileHelper;
 use PHPStan\Node\InClassMethodNode;
+use PHPStan\Node\LiteralArrayItem;
+use PHPStan\Node\LiteralArrayNode;
 use PHPStan\Parser\Parser;
 use PHPStan\PhpDoc\PhpDocBlock;
 use PHPStan\PhpDoc\Tag\ParamTag;
@@ -1322,9 +1324,12 @@ function (Scope $scope) use ($expr, $nodeCallback, $context): Scope {
 
 			$scope = $this->processExprNode($expr->var, $scope, $nodeCallback, $context->enterDeep())->getScope();
 		} elseif ($expr instanceof Array_) {
+			$itemNodes = [];
 			foreach ($expr->items as $arrayItem) {
+				$itemNodes[] = new LiteralArrayItem($scope, $arrayItem);
 				$scope = $this->processExprNode($arrayItem, $scope, $nodeCallback, $context->enterDeep())->getScope();
 			}
+			$nodeCallback(new LiteralArrayNode($expr, $itemNodes), $scope);
 		} elseif ($expr instanceof ArrayItem) {
 			if ($expr->key !== null) {
 				$scope = $this->processExprNode($expr->key, $scope, $nodeCallback, $context->enterDeep())->getScope();
diff --git a/src/Node/LiteralArrayItem.php b/src/Node/LiteralArrayItem.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Node;
+
+use PhpParser\Node\Expr\ArrayItem;
+use PHPStan\Analyser\Scope;
+
+class LiteralArrayItem
+{
+
+	/** @var Scope */
+	private $scope;
+
+	/** @var ArrayItem */
+	private $arrayItem;
+
+	public function __construct(Scope $scope, ArrayItem $arrayItem)
+	{
+		$this->scope = $scope;
+		$this->arrayItem = $arrayItem;
+	}
+
+	public function getScope(): Scope
+	{
+		return $this->scope;
+	}
+
+	public function getArrayItem(): ArrayItem
+	{
+		return $this->arrayItem;
+	}
+
+}
diff --git a/src/Node/LiteralArrayNode.php b/src/Node/LiteralArrayNode.php
@@ -0,0 +1,42 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Node;
+
+use PhpParser\Node\Expr\Array_;
+use PhpParser\NodeAbstract;
+
+class LiteralArrayNode extends NodeAbstract implements VirtualNode
+{
+
+	/** @var LiteralArrayItem[] */
+	private $itemNodes;
+
+	/**
+	 * @param Array_ $originalNode
+	 * @param LiteralArrayItem[] $itemNodes
+	 */
+	public function __construct(Array_ $originalNode, array $itemNodes)
+	{
+		parent::__construct($originalNode->getAttributes());
+		$this->itemNodes = $itemNodes;
+	}
+
+	/**
+	 * @return LiteralArrayItem[]
+	 */
+	public function getItemNodes(): array
+	{
+		return $this->itemNodes;
+	}
+
+	public function getType(): string
+	{
+		return 'PHPStan_Node_LiteralArray';
+	}
+
+	public function getSubNodeNames(): array
+	{
+		return [];
+	}
+
+}
diff --git a/src/Rules/Arrays/DuplicateKeysInLiteralArraysRule.php b/src/Rules/Arrays/DuplicateKeysInLiteralArraysRule.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Rules\Arrays;
 
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\LiteralArrayNode;
 use PHPStan\Rules\RuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\ConstantScalarType;
@@ -22,11 +23,11 @@ public function __construct(
 
 	public function getNodeType(): string
 	{
-		return \PhpParser\Node\Expr\Array_::class;
+		return LiteralArrayNode::class;
 	}
 
 	/**
-	 * @param \PhpParser\Node\Expr\Array_ $node
+	 * @param LiteralArrayNode $node
 	 * @param \PHPStan\Analyser\Scope $scope
 	 * @return RuleError[]
 	 */
@@ -36,16 +37,14 @@ public function processNode(\PhpParser\Node $node, Scope $scope): array
 		$duplicateKeys = [];
 		$printedValues = [];
 		$valueLines = [];
-		foreach ($node->items as $item) {
-			if ($item === null) {
-				continue;
-			}
+		foreach ($node->getItemNodes() as $itemNode) {
+			$item = $itemNode->getArrayItem();
 			if ($item->key === null) {
 				continue;
 			}
 
 			$key = $item->key;
-			$keyType = $scope->getType($key);
+			$keyType = $itemNode->getScope()->getType($key);
 			if (
 				!$keyType instanceof ConstantScalarType
 			) {
diff --git a/tests/PHPStan/Rules/Arrays/DuplicateKeysInLiteralArraysRuleTest.php b/tests/PHPStan/Rules/Arrays/DuplicateKeysInLiteralArraysRuleTest.php
@@ -32,6 +32,10 @@ public function testDuplicateKeys(): void
 				'Array has 2 duplicate keys with value \'=\' (self::EQ, self::IS).',
 				32,
 			],
+			[
+				'Array has 2 duplicate keys with value 2 ($idx, $idx).',
+				55,
+			],
 		]);
 	}
 
diff --git a/tests/PHPStan/Rules/Arrays/data/duplicate-keys.php b/tests/PHPStan/Rules/Arrays/data/duplicate-keys.php
@@ -35,4 +35,26 @@ public function doBar()
 		];
 	}
 
+	public function doIncrement()
+	{
+		$idx = 0;
+
+		$foo = [
+			$idx++ => 'test',
+			$idx++ => 'presto',
+		];
+	}
+
+	public function doIncrement2()
+	{
+		$idx = 0;
+
+		$foo = [
+			$idx++ => 'test',
+			$idx++ => 'presto',
+			$idx => 'lorem',
+			$idx => 'ipsum',
+		];
+	}
+
 }
