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

Author: ondrejmirtes

resources/functionMap.php

@@ -6403,8 +6403,8 @@
 'mcrypt_module_open' => ['resource|false', 'cipher'=>'string', 'cipher_directory'=>'string', 'mode'=>'string', 'mode_directory'=>'string'],
 'mcrypt_module_self_test' => ['bool', 'algorithm'=>'string', 'lib_dir='=>'string'],
 'mcrypt_ofb' => ['string', 'cipher'=>'string', 'key'=>'string', 'data'=>'string', 'mode'=>'int', 'iv='=>'string'],
-'md5' => ['non-falsy-string', 'str'=>'string', 'raw_output='=>'bool'],
-'md5_file' => ['non-falsy-string|false', 'filename'=>'string', 'raw_output='=>'bool'],
+'md5' => ['non-falsy-string&lowercase-string', 'str'=>'string', 'raw_output='=>'bool'],
+'md5_file' => ['(non-falsy-string&lowercase-string)|false', 'filename'=>'string', 'raw_output='=>'bool'],
 'mdecrypt_generic' => ['string', 'td'=>'resource', 'data'=>'string'],
 'Memcache::add' => ['bool', 'key'=>'string', 'var'=>'mixed', 'flag='=>'int', 'expire='=>'int'],
 'Memcache::addServer' => ['bool', 'host'=>'string', 'port='=>'int', 'persistent='=>'bool', 'weight='=>'int', 'timeout='=>'int', 'retry_interval='=>'int', 'status='=>'bool', 'failure_callback='=>'callable', 'timeoutms='=>'int'],
@@ -10446,8 +10446,8 @@
 'setRightFill' => ['void', 'red'=>'int', 'green'=>'int', 'blue'=>'int', 'a='=>'int'],
 'setthreadtitle' => ['bool', 'title'=>'string'],
 'settype' => ['bool', '&rw_var'=>'mixed', 'type'=>'string'],
-'sha1' => ['non-falsy-string', 'str'=>'string', 'raw_output='=>'bool'],
-'sha1_file' => ['non-falsy-string|false', 'filename'=>'string', 'raw_output='=>'bool'],
+'sha1' => ['non-falsy-string&lowercase-string', 'str'=>'string', 'raw_output='=>'bool'],
+'sha1_file' => ['(non-falsy-string&lowercase-string)|false', 'filename'=>'string', 'raw_output='=>'bool'],
 'sha256' => ['string', 'str'=>'string', 'raw_output='=>'bool'],
 'sha256_file' => ['string', 'filename'=>'string', 'raw_output='=>'bool'],
 'shapefileObj::__construct' => ['void', 'filename'=>'string', 'type'=>'int'],

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -911,4 +911,23 @@ public function testBug7173(): void
 		$this->analyse([__DIR__ . '/data/bug-7173.php'], []);
 	}
 
+	public function testHashing(): void
+	{
+		$this->analyse([__DIR__ . '/data/hashing.php'], [
+			[
+				"Strict comparison using === between lowercase-string&non-falsy-string and 'ABC' will always evaluate to false.",
+				9,
+			],
+			[
+				"Strict comparison using === between (lowercase-string&non-falsy-string)|false and 'ABC' will always evaluate to false.",
+				12,
+			],
+			[
+				"Strict comparison using === between (lowercase-string&non-falsy-string)|(non-falsy-string&numeric-string) and 'A' will always evaluate to false.",
+				31,
+				'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Comparison/data/hashing.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Hashing;
+
+use function md5;
+use function md5_file;
+
+function doFoo(string $s):void {
+	if (md5($s) === 'ABC') {
+
+	}
+	if (md5_file($s) === 'ABC') {
+
+	}
+}
+
+/**
+ * @param (non-falsy-string&numeric-string)|(non-falsy-string&lowercase-string) $s
+ * @return void
+ */
+function doFooBar($s) {
+	if ($s === '598d4c200461b81522a3328565c25f7c') {
+
+	}
+	if ($s === 'a') {
+
+	}
+	if ($s === '123') {
+
+	}
+	if ($s === 'A') {
+
+	}
+}