SignatureMapParser - test required parameter after optional

ondrejmirtes · ondrejmirtes · commit d2f443ccfe2c · 2020-09-30T15:12:24.000+02:00
diff --git a/resources/functionMap.php b/resources/functionMap.php
@@ -3919,7 +3919,7 @@
 'hash_init' => ['HashContext', 'algo'=>'string', 'options='=>'int', 'key='=>'string'],
 'hash_pbkdf2' => ['string', 'algo'=>'string', 'password'=>'string', 'salt'=>'string', 'iterations'=>'int', 'length='=>'int', 'raw_output='=>'bool'],
 'hash_update' => ['bool', 'context'=>'HashContext', 'data'=>'string'],
-'hash_update_file' => ['bool', 'context='=>'HashContext', 'filename'=>'string', 'scontext='=>'?HashContext'],
+'hash_update_file' => ['bool', 'context'=>'HashContext', 'filename'=>'string', 'scontext='=>'?HashContext'],
 'hash_update_stream' => ['int', 'context'=>'HashContext', 'handle'=>'resource', 'length='=>'int'],
 'hashTableObj::clear' => ['void'],
 'hashTableObj::get' => ['string', 'key'=>'string'],
@@ -5850,7 +5850,7 @@
 'ldap_add' => ['bool', 'link_identifier'=>'resource', 'dn'=>'string', 'entry'=>'array', 'servercontrols='=>'array'],
 'ldap_add_ext' => ['resource|false', 'link_identifier'=>'resource', 'dn'=>'string', 'entry'=>'array', 'servercontrols='=>'array'],
 'ldap_bind' => ['bool', 'link_identifier'=>'resource', 'bind_rdn='=>'string|null', 'bind_password='=>'string|null', 'serverctrls=' => 'array'],
-'ldap_bind_ext' => ['resource|false', 'link_identifier'=>'resource', 'bind_rdn='=>'string|null', 'bind_password='=>'string|null', 'serverctrls' => 'array'],
+'ldap_bind_ext' => ['resource|false', 'link_identifier'=>'resource', 'bind_rdn='=>'string|null', 'bind_password='=>'string|null', 'serverctrls=' => 'array'],
 'ldap_close' => ['bool', 'link_identifier'=>'resource'],
 'ldap_compare' => ['bool', 'link_identifier'=>'resource', 'dn'=>'string', 'attr'=>'string', 'value'=>'string'],
 'ldap_connect' => ['resource|false', 'host='=>'string', 'port='=>'int', 'wallet='=>'string', 'wallet_passwd='=>'string', 'authmode='=>'int'],
@@ -11861,8 +11861,8 @@
 'svn_ls' => ['array', 'repos_url'=>'string', 'revision_no='=>'int', 'recurse='=>'bool', 'peg='=>'bool'],
 'svn_mkdir' => ['bool', 'path'=>'string', 'log_message='=>'string'],
 'svn_move' => ['mixed', 'src_path'=>'string', 'dst_path'=>'string', 'force='=>'bool|false'],
-'svn_propget' => ['mixed', 'path'=>'string', 'property_name'=>'string', 'recurse='=>'bool|false', 'revision'=>'int'],
-'svn_proplist' => ['mixed', 'path'=>'string', 'recurse='=>'bool|false', 'revision'=>'int'],
+'svn_propget' => ['mixed', 'path'=>'string', 'property_name'=>'string', 'recurse='=>'bool|false', 'revision='=>'int'],
+'svn_proplist' => ['mixed', 'path'=>'string', 'recurse='=>'bool|false', 'revision='=>'int'],
 'svn_repos_create' => ['resource', 'path'=>'string', 'config='=>'array', 'fsconfig='=>'array'],
 'svn_repos_fs' => ['resource', 'repos'=>'resource'],
 'svn_repos_fs_begin_txn_for_commit' => ['resource', 'repos'=>'resource', 'rev'=>'int', 'author'=>'string', 'log_msg'=>'string'],
@@ -12657,7 +12657,7 @@
 'uopz_function\'1' => ['void', 'function'=>'string', 'handler'=>'Closure', 'modifiers='=>'int'],
 'uopz_get_exit_status' => ['mixed'],
 'uopz_get_mock' => ['mixed', 'class'=>'string'],
-'uopz_get_return' => ['mixed', 'class='=>'string', 'function'=>'string'],
+'uopz_get_return' => ['mixed', 'class='=>'string', 'function='=>'string'],
 'uopz_implement' => ['void', 'class'=>'string', 'interface'=>'string'],
 'uopz_overload' => ['void', 'opcode'=>'int', 'callable'=>'Callable'],
 'uopz_redefine' => ['void', 'class'=>'string', 'constant'=>'string', 'value'=>'mixed'],
@@ -12667,12 +12667,12 @@
 'uopz_restore' => ['void', 'class'=>'string', 'function'=>'string'],
 'uopz_restore\'1' => ['void', 'function'=>'string'],
 'uopz_set_mock' => ['void', 'class'=>'string', 'mock'=>'object|string'],
-'uopz_set_return' => ['bool', 'class='=>'string', 'function'=>'string', 'value'=>'mixed', 'execute='=>'bool'],
+'uopz_set_return' => ['bool', 'class'=>'string', 'function'=>'string', 'value'=>'mixed', 'execute='=>'bool'],
 'uopz_set_return\'1' => ['bool', 'function'=>'string', 'value'=>'mixed', 'execute='=>'bool'],
 'uopz_undefine' => ['void', 'class'=>'string', 'constant'=>'string'],
 'uopz_undefine\'1' => ['void', 'constant'=>'string'],
 'uopz_unset_mock' => ['void', 'class'=>'string'],
-'uopz_unset_return' => ['bool', 'class='=>'string', 'function'=>'string'],
+'uopz_unset_return' => ['bool', 'class='=>'string', 'function='=>'string'],
 'uopz_unset_return\'1' => ['bool', 'function'=>'string'],
 'urldecode' => ['string', 'str'=>'string'],
 'urlencode' => ['string', 'str'=>'string'],
diff --git a/tests/PHPStan/Reflection/SignatureMap/SignatureMapParserTest.php b/tests/PHPStan/Reflection/SignatureMap/SignatureMapParserTest.php
@@ -403,7 +403,13 @@ public function testParseAll(): void
 			}
 
 			self::assertNotInstanceOf(ErrorType::class, $signature->getReturnType(), $functionName);
+			$optionalOcurred = false;
 			foreach ($signature->getParameters() as $parameter) {
+				if ($parameter->isOptional()) {
+					$optionalOcurred = true;
+				} elseif ($optionalOcurred) {
+					$this->fail(sprintf('%s contains required parameter after optional.', $functionName));
+				}
 				self::assertNotInstanceOf(ErrorType::class, $parameter->getType(), sprintf('%s (parameter %s)', $functionName, $parameter->getName()));
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,13 @@ public function testParseAll(): void`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`self::assertNotInstanceOf(ErrorType::class, $signature->getReturnType(), $functionName);`
	`406`	`+ $optionalOcurred = false;`
`406`	`407`	`foreach ($signature->getParameters() as $parameter) {`
	`408`	`+ if ($parameter->isOptional()) {`
	`409`	`+ $optionalOcurred = true;`
	`410`	`+ } elseif ($optionalOcurred) {`
	`411`	`+ $this->fail(sprintf('%s contains required parameter after optional.', $functionName));`
	`412`	`+ }`
`407`	`413`	`self::assertNotInstanceOf(ErrorType::class, $parameter->getType(), sprintf('%s (parameter %s)', $functionName, $parameter->getName()));`
`408`	`414`	`}`
`409`	`415`	`}`