Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

Diff for: resources/functionMap.php

@@ -286,7 +286,7 @@
 'array_map' => ['array', 'callback'=>'?callable', 'array'=>'array', '...args='=>'array'],
 'array_merge' => ['array', 'arr1'=>'array', '...args='=>'array'],
 'array_merge_recursive' => ['array', 'arr1'=>'array', '...args='=>'array'],
-'array_multisort' => ['bool', '&rw_array1'=>'array', 'array1_sort_order='=>'array|int', 'array1_sort_flags='=>'array|int', '...args='=>'array|int'],
+'array_multisort' => ['bool', 'array1'=>'array', 'array1_sort_order='=>'array|int', 'array1_sort_flags='=>'array|int', '...args='=>'array|int'],
 'array_pad' => ['array', 'input'=>'array', 'pad_size'=>'int', 'pad_value'=>'mixed'],
 'array_pop' => ['mixed', '&rw_stack'=>'array'],
 'array_product' => ['int|float', 'input'=>'array'],
@@ -2637,7 +2637,7 @@
 'explode' => ['list<string>|false', 'separator'=>'string', 'str'=>'string', 'limit='=>'int'],
 'expm1' => ['float', 'number'=>'float'],
 'extension_loaded' => ['bool', 'extension_name'=>'string'],
-'extract' => ['0|positive-int', '&rw_var_array'=>'array', 'extract_type='=>'EXTR_OVERWRITE|EXTR_SKIP|EXTR_PREFIX_SAME|EXTR_PREFIX_ALL|EXTR_PREFIX_INVALID|EXTR_IF_EXISTS|EXTR_PREFIX_IF_EXISTS|EXTR_REFS', 'prefix='=>'string|null'],
+'extract' => ['0|positive-int', 'array'=>'array', 'flags='=>'EXTR_OVERWRITE|EXTR_SKIP|EXTR_PREFIX_SAME|EXTR_PREFIX_ALL|EXTR_PREFIX_INVALID|EXTR_IF_EXISTS|EXTR_PREFIX_IF_EXISTS|EXTR_REFS', 'prefix='=>'string|null'],
 'ezmlm_hash' => ['int', 'addr'=>'string'],
 'fam_cancel_monitor' => ['bool', 'fam'=>'resource', 'fam_monitor'=>'resource'],
 'fam_close' => ['void', 'fam'=>'resource'],

Diff for: resources/functionMap_php74delta.php

@@ -22,21 +22,21 @@
  */
 return [
 	'new' => [
-		'FFI::addr' => ['FFI\CData', '&ptr'=>'FFI\CData'],
-		'FFI::alignof' => ['int', '&ptr'=>'mixed'],
+		'FFI::addr' => ['FFI\CData', 'ptr'=>'FFI\CData'],
+		'FFI::alignof' => ['int', 'ptr'=>'mixed'],
 		'FFI::arrayType' => ['FFI\CType', 'type'=>'string|FFI\CType', 'dims'=>'array<int,int>'],
-		'FFI::cast' => ['FFI\CData', 'type'=>'string|FFI\CType', '&ptr'=>''],
+		'FFI::cast' => ['FFI\CData', 'type'=>'string|FFI\CType', 'ptr'=>''],
 		'FFI::cdef' => ['FFI', 'code='=>'string', 'lib='=>'?string'],
-		'FFI::free' => ['void', '&ptr'=>'FFI\CData'],
+		'FFI::free' => ['void', 'ptr'=>'FFI\CData'],
 		'FFI::load' => ['FFI', 'filename'=>'string'],
-		'FFI::memcmp' => ['int', '&ptr1'=>'FFI\CData|string', '&ptr2'=>'FFI\CData|string', 'size'=>'int'],
-		'FFI::memcpy' => ['void', '&dst'=>'FFI\CData', '&src'=>'string|FFI\CData', 'size'=>'int'],
-		'FFI::memset' => ['void', '&ptr'=>'FFI\CData', 'ch'=>'int', 'size'=>'int'],
+		'FFI::memcmp' => ['int', 'ptr1'=>'FFI\CData|string', 'ptr2'=>'FFI\CData|string', 'size'=>'int'],
+		'FFI::memcpy' => ['void', 'dst'=>'FFI\CData', 'src'=>'string|FFI\CData', 'size'=>'int'],
+		'FFI::memset' => ['void', 'ptr'=>'FFI\CData', 'ch'=>'int', 'size'=>'int'],
 		'FFI::new' => ['FFI\CData', 'type'=>'string|FFI\CType', 'owned='=>'bool', 'persistent='=>'bool'],
 		'FFI::scope' => ['FFI', 'scope_name'=>'string'],
-		'FFI::sizeof' => ['int', '&ptr'=>'FFI\CData|FFI\CType'],
-		'FFI::string' => ['string', '&ptr'=>'FFI\CData', 'size='=>'int'],
-		'FFI::typeof' => ['FFI\CType', '&ptr'=>'FFI\CData'],
+		'FFI::sizeof' => ['int', 'ptr'=>'FFI\CData|FFI\CType'],
+		'FFI::string' => ['string', 'ptr'=>'FFI\CData', 'size='=>'int'],
+		'FFI::typeof' => ['FFI\CType', 'ptr'=>'FFI\CData'],
 		'FFI::type' => ['FFI\CType', 'type'=>'string'],
 		'fread' => ['string|false', 'fp'=>'resource', 'length'=>'positive-int'],
 		'get_mangled_object_vars' => ['array', 'obj'=>'object'],

Diff for: tests/PHPStan/Analyser/nsrt/extract.php

@@ -66,3 +66,21 @@ function doTyped3(array $vars): void
 
 	assertVariableCertainty(TrinaryLogic::createNo(), $none);
 }
+
+function doTyped4(): void
+{
+	extract(['foo' => 42]);
+
+	assertVariableCertainty(TrinaryLogic::createYes(), $foo);
+	assertType('42', $foo);
+}
+
+
+function doTyped5(): void
+{
+	$foo = ['foo' => 42];
+	extract($foo);
+
+	assertVariableCertainty(TrinaryLogic::createYes(), $foo);
+	assertType('42', $foo);
+}

Diff for: tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -1905,4 +1905,9 @@ public function testBug7082(): void
 		]);
 	}
 
+	public function testBug11759(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-11759.php'], []);
+	}
+
 }

Diff for: tests/PHPStan/Rules/Functions/data/bug-11759.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Bug11759;
+
+extract(['answer' => 42 ]);