Merge branch '4.x' into upstream-master

dictionaries/CallMap.php

@@ -15115,7 +15115,7 @@ return [
 'UnexpectedValueException::getPrevious' => ['Throwable|UnexpectedValueException|null'],
 'UnexpectedValueException::getTrace' => ['list<array<string,mixed>>'],
 'UnexpectedValueException::getTraceAsString' => ['string'],
-'uniqid' => ['string', 'prefix='=>'string', 'more_entropy='=>'bool'],
+'uniqid' => ['non-empty-string', 'prefix='=>'string', 'more_entropy='=>'bool'],
 'unixtojd' => ['int', 'timestamp='=>'int'],
 'unlink' => ['bool', 'filename'=>'string', 'context='=>'resource'],
 'unpack' => ['array|false', 'format'=>'string', 'string'=>'string', 'offset='=>'int'],

dictionaries/CallMap_historical.php

@@ -16145,7 +16145,7 @@ return [
     'ui\window::setTitle' => ['', 'title'=>'string'],
     'uksort' => ['bool', '&rw_array'=>'array', 'callback'=>'callable(mixed,mixed):int'],
     'umask' => ['int', 'mask='=>'int'],
-    'uniqid' => ['string', 'prefix='=>'string', 'more_entropy='=>'bool'],
+    'uniqid' => ['non-empty-string', 'prefix='=>'string', 'more_entropy='=>'bool'],
     'unixtojd' => ['int', 'timestamp='=>'int'],
     'unlink' => ['bool', 'filename'=>'string', 'context='=>'resource'],
     'unpack' => ['array', 'format'=>'string', 'string'=>'string'],

psalm-baseline.xml

@@ -353,6 +353,9 @@
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Type/Atomic.php">
+    <DeprecatedClass occurrences="2">
+      <code>new THtmlEscapedString()</code>
+    </DeprecatedClass>
     <PossiblyUndefinedIntArrayOffset occurrences="1">
       <code>array_keys($template_type_map[$value])[0]</code>
     </PossiblyUndefinedIntArrayOffset>

src/Psalm/Type/Atomic/THtmlEscapedString.php

@@ -4,6 +4,7 @@ namespace Psalm\Type\Atomic;
 
 /**
  * Special type, specifically for consumption by plugins.
+ * @deprecated going to be removed in Psalm 5. Use taints instead.
  */
 class THtmlEscapedString extends TString
 {

stubs/pdo.phpstub

@@ -10,7 +10,7 @@ class PDOStatement implements Traversable
     /**
      * @psalm-taint-sink callable $class
      *
-     * @template T
+     * @template T of object
      * @param class-string<T> $class
      * @param array $ctorArgs
      * @return false|T