Commit ef63534

committed

Strict iterator_to_array, do not overwite duplicate keys

1 parent 2091311 commit ef63534Copy full SHA for ef63534

File tree

+19

-5

lines changed

+19

-5

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	* Require booleans in `if`, `elseif`, ternary operator, after `!`, and on both sides of `&&` and `\|\|`.
`10`	`10`	* Functions `in_array` and `array_search` must be called with third parameter `$strict` set to `true` to search values with matching types only.
	`11`	+* Function `iterator_to_array` must be called with second parameter `$use_keys` set to `false` to not overwite duplicate iterator keys in the result.
`11`	`12`	* Variables assigned in `while` loop condition and `for` loop initial assignment cannot be used after the loop.
`12`	`13`	* Types in `switch` condition and `case` value must match. PHP compares them loosely by default and that can lead to unexpected results.
`13`	`14`	`* Statically declared methods are called statically.`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,11 @@`
`5`	`5`	`class StrictFunctionCallsRule implements \PHPStan\Rules\Rule`
`6`	`6`	`{`
`7`	`7`
`8`		`- /** @var int[] */`
	`8`	`+ /** @var array<string, array> */`
`9`	`9`	`private $functionArguments = [`
`10`		`- 'in_array' => 2,`
`11`		`- 'array_search' => 2,`
	`10`	`+ 'in_array' => [2, true],`
	`11`	`+ 'array_search' => [2, true],`
	`12`	`+ 'iterator_to_array' => [1, false],`
`12`	`13`	`];`
`13`	`14`
`14`	`15`	`/** @var \PHPStan\Broker\Broker */`
`@@ -44,8 +45,8 @@ public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scop`
`44`	`45`	`return [];`
`45`	`46`	`}`
`46`	`47`
`47`		`- $argumentPosition = $this->functionArguments[$functionName];`
`48`		`- $message = sprintf('Call to function %s() requires parameter #%d to be true.', $functionName, $argumentPosition + 1);`
	`48`	`+ $argumentPosition = $this->functionArguments[$functionName][0];`
	`49`	`+ $message = sprintf('Call to function %s() requires parameter #%d to be %s.', $functionName, $argumentPosition + 1, $this->functionArguments[$functionName][1] ? 'true' : 'false');`
`49`	`50`	`if (!array_key_exists($argumentPosition, $node->args)) {`
`50`	`51`	`return [$message];`
`51`	`52`	`}`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,14 @@ public function testRule(): void`
`39`	`39`	`'Call to function array_search() requires parameter #3 to be true.',`
`40`	`40`	`13,`
`41`	`41`	`],`
	`42`	`+ [`
	`43`	`+ 'Call to function iterator_to_array() requires parameter #2 to be false.',`
	`44`	`+ 18,`
	`45`	`+ ],`
	`46`	`+ [`
	`47`	`+ 'Call to function iterator_to_array() requires parameter #2 to be false.',`
	`48`	`+ 20,`
	`49`	`+ ],`
`42`	`50`	`]);`
`43`	`51`	`}`
`44`	`52`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,7 @@`
`14`	`14`
`15`	`15`	`$dynamicCall = 'foo';`
`16`	`16`	`$dynamicCall();`
	`17`	`+`
	`18`	`+iterator_to_array(new \ArrayIterator([]), false);`
	`19`	`+iterator_to_array(new \ArrayIterator([]), true);`
	`20`	`+iterator_to_array(new \ArrayIterator([]));`

Comments

(0)