Improve sscanf() signature

phpstan · Jul 7, 2021 · d50aa7d · d50aa7d
1 parent 790a838
commit d50aa7d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/resources/functionMap.php b/resources/functionMap.php
@@ -11546,7 +11546,8 @@
 'sqlsrv_server_info' => ['array', 'conn'=>'resource'],
 'sqrt' => ['float', 'number'=>'float'],
 'srand' => ['void', 'seed='=>'int', 'mode='=>'int'],
-'sscanf' => ['mixed', 'str'=>'string', 'format'=>'string', '&...w_vars='=>'string|int|float|null'],
+'sscanf' => ['int|null', 'str'=>'string', 'format'=>'string', '&w_war'=>'string|int|float|null', '&...w_vars='=>'string|int|float|null'],
+'sscanf\'1' => ['array|null', 'str'=>'string', 'format'=>'string'],
 'ssdeep_fuzzy_compare' => ['int', 'signature1'=>'string', 'signature2'=>'string'],
 'ssdeep_fuzzy_hash' => ['string', 'to_hash'=>'string'],
 'ssdeep_fuzzy_hash_filename' => ['string', 'file_name'=>'string'],

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -435,6 +435,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3981.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4711.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/sscanf.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/sscanf.php b/tests/PHPStan/Analyser/data/sscanf.php
@@ -0,0 +1,6 @@
+<?php
+
+use function PHPStan\Testing\assertType;
+
+assertType('int|null', sscanf('20-20', '%d-%d', $first, $second));
+assertType('array|null', sscanf('20-20', '%d-%d'));