Merge branch refs/heads/1.12.x into 2.0.x

Author: phpstan-bot

conf/config.neon

@@ -1386,11 +1386,6 @@ services:
 		tags:
 			- phpstan.broker.dynamicFunctionReturnTypeExtension
 
-	-
-		class: PHPStan\Type\Php\CurlInitReturnTypeExtension
-		tags:
-			- phpstan.broker.dynamicFunctionReturnTypeExtension
-
 	-
 		class: PHPStan\Type\Php\DateFunctionReturnTypeHelper
 

resources/functionMap.php

@@ -1494,7 +1494,7 @@
 'curl_exec' => ['bool|string', 'ch'=>'resource'],
 'curl_file_create' => ['CURLFile', 'filename'=>'string', 'mimetype='=>'string', 'postfilename='=>'string'],
 'curl_getinfo' => ['mixed', 'ch'=>'resource', 'option='=>'int'],
-'curl_init' => ['resource|false', 'url='=>'string'],
+'curl_init' => ['__benevolent<resource|false>', 'url='=>'string'],
 'curl_multi_add_handle' => ['int', 'mh'=>'resource', 'ch'=>'resource'],
 'curl_multi_close' => ['void', 'mh'=>'resource'],
 'curl_multi_errno' => ['int', 'mh'=>'resource'],

resources/functionMap_php80delta.php

@@ -31,6 +31,7 @@
 		'ceil' => ['float', 'number'=>'float'],
 		'com_load_typelib' => ['bool', 'typelib_name'=>'string', 'case_insensitive='=>'true'],
 		'count_chars' => ['array<int,int>|string', 'input'=>'string', 'mode='=>'int'],
+		'curl_init' => ['__benevolent<CurlHandle|false>', 'url='=>'string'],
 		'date_add' => ['DateTime', 'object'=>'DateTime', 'interval'=>'DateInterval'],
 		'date_date_set' => ['DateTime', 'object'=>'DateTime', 'year'=>'int', 'month'=>'int', 'day'=>'int'],
 		'date_diff' => ['DateInterval', 'obj1'=>'DateTimeInterface', 'obj2'=>'DateTimeInterface', 'absolute='=>'bool'],
@@ -169,6 +170,7 @@
 		'convert_cyr_string' => ['string', 'str'=>'string', 'from'=>'string', 'to'=>'string'],
 		'com_load_typelib' => ['bool', 'typelib_name'=>'string', 'case_insensitive='=>'bool'],
 		'count_chars' => ['array<int,int>|false|string', 'input'=>'string', 'mode='=>'int'],
+		'curl_init' => ['__benevolent<resource|false>', 'url='=>'string'],
 		'date_add' => ['DateTime|false', 'object'=>'DateTime', 'interval'=>'DateInterval'],
 		'date_date_set' => ['DateTime|false', 'object'=>'DateTime', 'year'=>'int', 'month'=>'int', 'day'=>'int'],
 		'date_diff' => ['DateInterval|false', 'obj1'=>'DateTimeInterface', 'obj2'=>'DateTimeInterface', 'absolute='=>'bool'],

src/Type/Php/CurlInitReturnTypeExtension.php

@@ -1443,6 +1443,12 @@ public function testBug11511(): void
 		$this->assertSame('Access to an undefined property object::$bar.', $errors[0]->getMessage());
 	}
 
+	public function testBug11640(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-11640.php');
+		$this->assertNoErrors($errors);
+	}
+
 	/**
 	 * @param string[]|null $allAnalysedFiles
 	 * @return Error[]

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types = 1);
+
+namespace Bug11640;
+
+$ch = curl_init('https://example.com');
+
+if (!$ch) {
+
+}

tests/PHPStan/Analyser/data/bug-11640.php

@@ -12,6 +12,7 @@
 use PHPStan\Reflection\PassedByReference;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\ArrayType;
+use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\CallableType;
 use PHPStan\Type\ClassStringType;
@@ -59,7 +60,7 @@ public function dataFunctions(): array
 						'variadic' => false,
 					],
 				],
-				new UnionType([
+				new BenevolentUnionType([
 					new ObjectType('CurlHandle'),
 					new ConstantBooleanType(false),
 				]),