Merge remote-tracking branch 'origin/master' into fixes

dictionaries/CallMap.php

@@ -1318,7 +1318,7 @@
 'date_get_last_errors' => ['array{warning_count:int,warnings:array<int,string>,error_count:int,errors:array<int,string>}|false'],
 'date_interval_create_from_date_string' => ['DateInterval', 'datetime'=>'string'],
 'date_interval_format' => ['string', 'object'=>'DateInterval', 'format'=>'string'],
-'date_isodate_set' => ['DateTime|false', 'object'=>'DateTime', 'year'=>'int', 'week'=>'int', 'dayOfWeek='=>'int|mixed'],
+'date_isodate_set' => ['DateTime', 'object'=>'DateTime', 'year'=>'int', 'week'=>'int', 'dayOfWeek='=>'int'],
 'date_modify' => ['DateTime|false', 'object'=>'DateTime', 'modifier'=>'string'],
 'date_offset_get' => ['int', 'object'=>'DateTimeInterface'],
 'date_parse' => ['array', 'datetime'=>'string'],
@@ -1987,7 +1987,7 @@
 'Ds\Vector::sum' => ['int|float'],
 'Ds\Vector::toArray' => ['array'],
 'Ds\Vector::unshift' => ['void', '...values='=>'mixed'],
-'easter_date' => ['int', 'year='=>'?int'],
+'easter_date' => ['int', 'year='=>'?int', 'mode='=>'int'],
 'easter_days' => ['int', 'year='=>'?int', 'mode='=>'int'],
 'echo' => ['void', 'arg1'=>'string', '...args='=>'string'],
 'eio_busy' => ['resource', 'delay'=>'int', 'pri='=>'int', 'callback='=>'callable', 'data='=>'mixed'],
@@ -7819,10 +7819,10 @@
 'mysqli::next_result' => ['bool'],
 'mysqli::options' => ['bool', 'option'=>'int', 'value'=>'string|int'],
 'mysqli::ping' => ['bool'],
-'mysqli::poll' => ['int|false', '&w_read'=>'array', '&w_write'=>'array', '&w_error'=>'array', 'seconds'=>'int', 'microseconds='=>'int'],
+'mysqli::poll' => ['int|false', '&w_read'=>'?array', '&w_error'=>'?array', '&w_reject'=>'array', 'seconds'=>'int', 'microseconds='=>'int'],
 'mysqli::prepare' => ['mysqli_stmt|false', 'query'=>'string'],
 'mysqli::query' => ['bool|mysqli_result', 'query'=>'string', 'result_mode='=>'int'],
-'mysqli::real_connect' => ['bool', 'hostname='=>'string|null', 'username='=>'string|null', 'password='=>'string|null', 'database='=>'string|null', 'port='=>'int|null', 'socket='=>'string|null', 'flags='=>'int'],
+'mysqli::real_connect' => ['bool', 'hostname='=>'?string', 'username='=>'?string', 'password='=>'?string', 'database='=>'?string', 'port='=>'?int', 'socket='=>'?string', 'flags='=>'int'],
 'mysqli::real_escape_string' => ['string', 'string'=>'string'],
 'mysqli::real_query' => ['bool', 'query'=>'string'],
 'mysqli::reap_async_query' => ['mysqli_result|false'],
@@ -7907,10 +7907,10 @@
 'mysqli_num_rows' => ['int<0, max>|numeric-string', 'result'=>'mysqli_result'],
 'mysqli_options' => ['bool', 'mysql'=>'mysqli', 'option'=>'int', 'value'=>'string|int'],
 'mysqli_ping' => ['bool', 'mysql'=>'mysqli'],
-'mysqli_poll' => ['int|false', 'read'=>'array', 'write'=>'array', 'error'=>'array', 'seconds'=>'int', 'microseconds='=>'int'],
+'mysqli_poll' => ['int|false', '&w_read'=>'?array', '&w_error'=>'?array', '&w_reject'=>'array', 'seconds'=>'int', 'microseconds='=>'int'],
 'mysqli_prepare' => ['mysqli_stmt|false', 'mysql'=>'mysqli', 'query'=>'string'],
 'mysqli_query' => ['mysqli_result|bool', 'mysql'=>'mysqli', 'query'=>'string', 'result_mode='=>'int'],
-'mysqli_real_connect' => ['bool', 'mysql='=>'mysqli', 'hostname='=>'string|null', 'username='=>'string|null', 'password='=>'string|null', 'database='=>'string|null', 'port='=>'int|null', 'socket='=>'string|null', 'flags='=>'int'],
+'mysqli_real_connect' => ['bool', 'mysql'=>'mysqli', 'hostname='=>'?string', 'username='=>'?string', 'password='=>'?string', 'database='=>'?string', 'port='=>'?int', 'socket='=>'?string', 'flags='=>'int'],
 'mysqli_real_escape_string' => ['string', 'mysql'=>'mysqli', 'string'=>'string'],
 'mysqli_real_query' => ['bool', 'mysql'=>'mysqli', 'query'=>'string'],
 'mysqli_reap_async_query' => ['mysqli_result|false', 'mysql'=>'mysqli'],
@@ -7952,10 +7952,10 @@
 'mysqli_sqlstate' => ['string', 'mysql'=>'mysqli'],
 'mysqli_ssl_set' => ['true', 'mysql'=>'mysqli', 'key'=>'?string', 'certificate'=>'?string', 'ca_certificate'=>'?string', 'ca_path'=>'?string', 'cipher_algos'=>'?string'],
 'mysqli_stat' => ['string|false', 'mysql'=>'mysqli'],
-'mysqli_stmt::__construct' => ['void', 'mysql'=>'mysqli', 'query'=>'string'],
+'mysqli_stmt::__construct' => ['void', 'mysql'=>'mysqli', 'query='=>'?string'],
 'mysqli_stmt::attr_get' => ['int', 'attribute'=>'int'],
 'mysqli_stmt::attr_set' => ['bool', 'attribute'=>'int', 'value'=>'int'],
-'mysqli_stmt::bind_param' => ['bool', 'types'=>'string', '&vars'=>'mixed', '&...args='=>'mixed'],
+'mysqli_stmt::bind_param' => ['bool', 'types'=>'string', '&var'=>'mixed', '&...vars='=>'mixed'],
 'mysqli_stmt::bind_result' => ['bool', '&w_var1'=>'', '&...w_vars='=>''],
 'mysqli_stmt::close' => ['bool'],
 'mysqli_stmt::data_seek' => ['void', 'offset'=>'int'],
@@ -7975,7 +7975,7 @@
 'mysqli_stmt_affected_rows' => ['int<-1, max>|numeric-string', 'statement'=>'mysqli_stmt'],
 'mysqli_stmt_attr_get' => ['int', 'statement'=>'mysqli_stmt', 'attribute'=>'int'],
 'mysqli_stmt_attr_set' => ['bool', 'statement'=>'mysqli_stmt', 'attribute'=>'int', 'value'=>'int'],
-'mysqli_stmt_bind_param' => ['bool', 'statement'=>'mysqli_stmt', 'types'=>'string', '&vars'=>'mixed', '&...args='=>'mixed'],
+'mysqli_stmt_bind_param' => ['bool', 'statement'=>'mysqli_stmt', 'types'=>'string', '&var'=>'mixed', '&...vars='=>'mixed'],
 'mysqli_stmt_bind_result' => ['bool', 'statement'=>'mysqli_stmt', '&w_var1'=>'', '&...w_vars='=>''],
 'mysqli_stmt_close' => ['true', 'statement'=>'mysqli_stmt'],
 'mysqli_stmt_data_seek' => ['void', 'statement'=>'mysqli_stmt', 'offset'=>'int'],
@@ -8395,9 +8395,9 @@
 'odbc_pconnect' => ['resource|false', 'dsn'=>'string', 'user'=>'string', 'password'=>'string', 'cursor_option='=>'int'],
 'odbc_prepare' => ['resource|false', 'odbc'=>'resource', 'query'=>'string'],
 'odbc_primarykeys' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'?string', 'schema'=>'string', 'table'=>'string'],
-'odbc_procedurecolumns' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'procedure'=>'string', 'column'=>'string'],
-'odbc_procedures' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'procedure'=>'string'],
-'odbc_result' => ['mixed|false', 'statement'=>'resource', 'field'=>'mixed'],
+'odbc_procedurecolumns' => ['resource|false', 'odbc'=>'resource', 'catalog='=>'?string', 'schema='=>'?string', 'procedure='=>'?string', 'column='=>'?string'],
+'odbc_procedures' => ['resource|false', 'odbc'=>'resource', 'catalog='=>'?string', 'schema='=>'?string', 'procedure='=>'?string'],
+'odbc_result' => ['string|bool|null', 'statement'=>'resource', 'field'=>'string|int'],
 'odbc_result_all' => ['int|false', 'statement'=>'resource', 'format='=>'string'],
 'odbc_rollback' => ['bool', 'odbc'=>'resource'],
 'odbc_setoption' => ['bool', 'odbc'=>'resource', 'which'=>'int', 'option'=>'int', 'value'=>'int'],
@@ -12701,7 +12701,7 @@
 'sqlsrv_commit' => ['bool', 'conn'=>'resource'],
 'sqlsrv_configure' => ['bool', 'setting'=>'string', 'value'=>'mixed'],
 'sqlsrv_connect' => ['resource|false', 'serverName'=>'string', 'connectionInfo='=>'array'],
-'sqlsrv_errors' => ['?array', 'errorsOrWarnings='=>'int'],
+'sqlsrv_errors' => ['?array', 'errorsAndOrWarnings='=>'int'],
 'sqlsrv_execute' => ['bool', 'stmt'=>'resource'],
 'sqlsrv_fetch' => ['?bool', 'stmt'=>'resource', 'row='=>'int', 'offset='=>'int'],
 'sqlsrv_fetch_array' => ['array|null|false', 'stmt'=>'resource', 'fetchType='=>'int', 'row='=>'int', 'offset='=>'int'],
@@ -12891,7 +12891,7 @@
 'stream_context_create' => ['resource', 'options='=>'?array', 'params='=>'?array'],
 'stream_context_get_default' => ['resource', 'options='=>'?array'],
 'stream_context_get_options' => ['array', 'stream_or_context'=>'resource'],
-'stream_context_get_params' => ['array', 'context'=>'resource'],
+'stream_context_get_params' => ['array{notification:string,options:array}', 'context'=>'resource'],
 'stream_context_set_default' => ['resource', 'options'=>'array'],
 'stream_context_set_option' => ['bool', 'context'=>'', 'wrapper_or_options'=>'string', 'option_name'=>'string', 'value'=>''],
 'stream_context_set_option\'1' => ['bool', 'context'=>'', 'wrapper_or_options'=>'array'],

dictionaries/CallMap_80_delta.php

@@ -224,6 +224,10 @@
       'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
       'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
     ],
+    'mysqli_stmt::__construct' => [
+      'old' => ['void', 'mysql'=>'mysqli', 'query='=>'string'],
+      'new' => ['void', 'mysql'=>'mysqli', 'query='=>'?string'],
+    ],
     'NumberFormatter::__construct' => [
       'old' => ['void', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'],
       'new' => ['void', 'locale'=>'string', 'style'=>'int', 'pattern='=>'?string'],
@@ -817,8 +821,8 @@
       'new' => ['DOMElement', 'node'=>'SimpleXMLElement'],
     ],
     'easter_date' => [
-      'old' => ['int', 'year='=>'int'],
-      'new' => ['int', 'year='=>'?int'],
+      'old' => ['int', 'year='=>'int', 'mode='=>'int'],
+      'new' => ['int', 'year='=>'?int', 'mode='=>'int'],
     ],
     'easter_days' => [
       'old' => ['int', 'year='=>'int', 'mode='=>'int'],

dictionaries/CallMap_historical.php

@@ -9790,7 +9790,7 @@
     'date_get_last_errors' => ['array{warning_count:int,warnings:array<int,string>,error_count:int,errors:array<int,string>}|false'],
     'date_interval_create_from_date_string' => ['DateInterval', 'datetime'=>'string'],
     'date_interval_format' => ['string', 'object'=>'DateInterval', 'format'=>'string'],
-    'date_isodate_set' => ['DateTime|false', 'object'=>'DateTime', 'year'=>'int', 'week'=>'int', 'dayOfWeek='=>'int|mixed'],
+    'date_isodate_set' => ['DateTime', 'object'=>'DateTime', 'year'=>'int', 'week'=>'int', 'dayOfWeek='=>'int'],
     'date_modify' => ['DateTime|false', 'object'=>'DateTime', 'modifier'=>'string'],
     'date_offset_get' => ['int|false', 'object'=>'DateTimeInterface'],
     'date_parse' => ['array|false', 'datetime'=>'string'],
@@ -10026,7 +10026,7 @@
     'dotnet_load' => ['int', 'assembly_name'=>'string', 'datatype_name='=>'string', 'codepage='=>'int'],
     'doubleval' => ['float', 'value'=>'mixed'],
     'each' => ['array{0:int|string,key:int|string,1:mixed,value:mixed}', '&r_arr'=>'array'],
-    'easter_date' => ['int', 'year='=>'int'],
+    'easter_date' => ['int', 'year='=>'int', 'mode='=>'int'],
     'easter_days' => ['int', 'year='=>'int', 'mode='=>'int'],
     'echo' => ['void', 'arg1'=>'string', '...args='=>'string'],
     'eio_busy' => ['resource', 'delay'=>'int', 'pri='=>'int', 'callback='=>'callable', 'data='=>'mixed'],
@@ -12717,10 +12717,10 @@
     'mysqli::next_result' => ['bool'],
     'mysqli::options' => ['bool', 'option'=>'int', 'value'=>'string|int'],
     'mysqli::ping' => ['bool'],
-    'mysqli::poll' => ['int|false', '&w_read'=>'array', '&w_write'=>'array', '&w_error'=>'array', 'seconds'=>'int', 'microseconds='=>'int'],
+    'mysqli::poll' => ['int|false', '&w_read'=>'?array', '&w_error'=>'?array', '&w_reject'=>'array', 'seconds'=>'int', 'microseconds='=>'int'],
     'mysqli::prepare' => ['mysqli_stmt|false', 'query'=>'string'],
     'mysqli::query' => ['bool|mysqli_result', 'query'=>'string', 'result_mode='=>'int'],
-    'mysqli::real_connect' => ['bool', 'hostname='=>'string|null', 'username='=>'string|null', 'password='=>'string|null', 'database='=>'string|null', 'port='=>'int|null', 'socket='=>'string|null', 'flags='=>'int'],
+    'mysqli::real_connect' => ['bool', 'hostname='=>'?string', 'username='=>'?string', 'password='=>'?string', 'database='=>'?string', 'port='=>'?int', 'socket='=>'?string', 'flags='=>'int'],
     'mysqli::real_escape_string' => ['string', 'string'=>'string'],
     'mysqli::real_query' => ['bool', 'query'=>'string'],
     'mysqli::reap_async_query' => ['mysqli_result|false'],
@@ -12803,10 +12803,10 @@
     'mysqli_num_rows' => ['int<0, max>|numeric-string', 'result'=>'mysqli_result'],
     'mysqli_options' => ['bool', 'mysql'=>'mysqli', 'option'=>'int', 'value'=>'string|int'],
     'mysqli_ping' => ['bool', 'mysql'=>'mysqli'],
-    'mysqli_poll' => ['int|false', 'read'=>'array', 'write'=>'array', 'error'=>'array', 'seconds'=>'int', 'microseconds='=>'int'],
+    'mysqli_poll' => ['int|false', '&w_read'=>'?array', '&w_error'=>'?array', '&w_reject'=>'array', 'seconds'=>'int', 'microseconds='=>'int'],
     'mysqli_prepare' => ['mysqli_stmt|false', 'mysql'=>'mysqli', 'query'=>'string'],
     'mysqli_query' => ['mysqli_result|bool', 'mysql'=>'mysqli', 'query'=>'string', 'result_mode='=>'int'],
-    'mysqli_real_connect' => ['bool', 'mysql='=>'mysqli', 'hostname='=>'string|null', 'username='=>'string|null', 'password='=>'string|null', 'database='=>'string|null', 'port='=>'int|null', 'socket='=>'string|null', 'flags='=>'int'],
+    'mysqli_real_connect' => ['bool', 'mysql'=>'mysqli', 'hostname='=>'?string', 'username='=>'?string', 'password='=>'?string', 'database='=>'?string', 'port='=>'?int', 'socket='=>'?string', 'flags='=>'int'],
     'mysqli_real_escape_string' => ['string', 'mysql'=>'mysqli', 'string'=>'string'],
     'mysqli_real_query' => ['bool', 'mysql'=>'mysqli', 'query'=>'string'],
     'mysqli_reap_async_query' => ['mysqli_result|false', 'mysql'=>'mysqli'],
@@ -12847,10 +12847,10 @@
     'mysqli_sqlstate' => ['string', 'mysql'=>'mysqli'],
     'mysqli_ssl_set' => ['true', 'mysql'=>'mysqli', 'key'=>'?string', 'certificate'=>'?string', 'ca_certificate'=>'?string', 'ca_path'=>'?string', 'cipher_algos'=>'?string'],
     'mysqli_stat' => ['string|false', 'mysql'=>'mysqli'],
-    'mysqli_stmt::__construct' => ['void', 'mysql'=>'mysqli', 'query'=>'string'],
+    'mysqli_stmt::__construct' => ['void', 'mysql'=>'mysqli', 'query='=>'string'],
     'mysqli_stmt::attr_get' => ['int', 'attribute'=>'int'],
     'mysqli_stmt::attr_set' => ['bool', 'attribute'=>'int', 'value'=>'int'],
-    'mysqli_stmt::bind_param' => ['bool', 'types'=>'string', '&vars'=>'mixed', '&...args='=>'mixed'],
+    'mysqli_stmt::bind_param' => ['bool', 'types'=>'string', '&var'=>'mixed', '&...vars='=>'mixed'],
     'mysqli_stmt::bind_result' => ['bool', '&w_var1'=>'', '&...w_vars='=>''],
     'mysqli_stmt::close' => ['bool'],
     'mysqli_stmt::data_seek' => ['void', 'offset'=>'int'],
@@ -12870,7 +12870,7 @@
     'mysqli_stmt_affected_rows' => ['int<-1, max>|numeric-string', 'statement'=>'mysqli_stmt'],
     'mysqli_stmt_attr_get' => ['int', 'statement'=>'mysqli_stmt', 'attribute'=>'int'],
     'mysqli_stmt_attr_set' => ['bool', 'statement'=>'mysqli_stmt', 'attribute'=>'int', 'value'=>'int'],
-    'mysqli_stmt_bind_param' => ['bool', 'statement'=>'mysqli_stmt', 'types'=>'string', '&vars'=>'mixed', '&...args='=>'mixed'],
+    'mysqli_stmt_bind_param' => ['bool', 'statement'=>'mysqli_stmt', 'types'=>'string', '&var'=>'mixed', '&...vars='=>'mixed'],
     'mysqli_stmt_bind_result' => ['bool', 'statement'=>'mysqli_stmt', '&w_var1'=>'', '&...w_vars='=>''],
     'mysqli_stmt_close' => ['true', 'statement'=>'mysqli_stmt'],
     'mysqli_stmt_data_seek' => ['void', 'statement'=>'mysqli_stmt', 'offset'=>'int'],
@@ -13134,9 +13134,9 @@
     'odbc_pconnect' => ['resource|false', 'dsn'=>'string', 'user'=>'string', 'password'=>'string', 'cursor_option='=>'int'],
     'odbc_prepare' => ['resource|false', 'odbc'=>'resource', 'query'=>'string'],
     'odbc_primarykeys' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'?string', 'schema'=>'string', 'table'=>'string'],
-    'odbc_procedurecolumns' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'procedure'=>'string', 'column'=>'string'],
-    'odbc_procedures' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'procedure'=>'string'],
-    'odbc_result' => ['mixed|false', 'statement'=>'resource', 'field'=>'mixed'],
+    'odbc_procedurecolumns' => ['resource|false', 'odbc'=>'resource', 'catalog='=>'?string', 'schema='=>'?string', 'procedure='=>'?string', 'column='=>'?string'],
+    'odbc_procedures' => ['resource|false', 'odbc'=>'resource', 'catalog='=>'?string', 'schema='=>'?string', 'procedure='=>'?string'],
+    'odbc_result' => ['string|bool|null', 'statement'=>'resource', 'field'=>'string|int'],
     'odbc_result_all' => ['int|false', 'statement'=>'resource', 'format='=>'string'],
     'odbc_rollback' => ['bool', 'odbc'=>'resource'],
     'odbc_setoption' => ['bool', 'odbc'=>'resource', 'which'=>'int', 'option'=>'int', 'value'=>'int'],
@@ -14115,7 +14115,7 @@
     'sqlsrv_commit' => ['bool', 'conn'=>'resource'],
     'sqlsrv_configure' => ['bool', 'setting'=>'string', 'value'=>'mixed'],
     'sqlsrv_connect' => ['resource|false', 'serverName'=>'string', 'connectionInfo='=>'array'],
-    'sqlsrv_errors' => ['?array', 'errorsOrWarnings='=>'int'],
+    'sqlsrv_errors' => ['?array', 'errorsAndOrWarnings='=>'int'],
     'sqlsrv_execute' => ['bool', 'stmt'=>'resource'],
     'sqlsrv_fetch' => ['?bool', 'stmt'=>'resource', 'row='=>'int', 'offset='=>'int'],
     'sqlsrv_fetch_array' => ['array|null|false', 'stmt'=>'resource', 'fetchType='=>'int', 'row='=>'int', 'offset='=>'int'],
@@ -14311,7 +14311,7 @@
     'stream_context_create' => ['resource', 'options='=>'array', 'params='=>'array'],
     'stream_context_get_default' => ['resource', 'options='=>'array'],
     'stream_context_get_options' => ['array', 'stream_or_context'=>'resource'],
-    'stream_context_get_params' => ['array', 'context'=>'resource'],
+    'stream_context_get_params' => ['array{notification:string,options:array}', 'context'=>'resource'],
     'stream_context_set_default' => ['resource', 'options'=>'array'],
     'stream_context_set_option' => ['bool', 'context'=>'', 'wrapper_or_options'=>'string', 'option_name'=>'string', 'value'=>''],
     'stream_context_set_option\'1' => ['bool', 'context'=>'', 'wrapper_or_options'=>'array'],

psalm-baseline.xml

@@ -466,7 +466,6 @@
   <file src="src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php">
     <ImpureMethodCall>
       <code>getClassTemplateTypes</code>
-      <code>has</code>
     </ImpureMethodCall>
   </file>
   <file src="src/Psalm/Internal/Type/TypeCombiner.php">
@@ -488,7 +487,6 @@
     <PossiblyUndefinedIntArrayOffset>
       <code>$const_name</code>
       <code>$const_name</code>
-      <code>$intersection_types[0]</code>
       <code><![CDATA[$parse_tree->children[0]]]></code>
       <code><![CDATA[$parse_tree->condition->children[0]]]></code>
       <code>array_keys($offset_template_data)[0]</code>
@@ -643,7 +641,6 @@
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$this->properties[0]]]></code>
       <code><![CDATA[$this->properties[0]]]></code>
-      <code><![CDATA[$this->properties[0]]]></code>
     </PossiblyUndefinedIntArrayOffset>
     <PossiblyUnusedMethod>
       <code>getList</code>

src/Psalm/Config.php

@@ -1735,7 +1735,8 @@ public function shortenFileName(string $to): string
 
     public function reportIssueInFile(string $issue_type, string $file_path): bool
     {
-        if (($this->show_mixed_issues === false || $this->level > 2)
+        if ((($this->level < 3 && $this->show_mixed_issues === false)
+            || ($this->level > 2 && $this->show_mixed_issues !== true))
             && in_array($issue_type, self::MIXED_ISSUES, true)
         ) {
             return false;