Merge remote-tracking branch 'vimeo/master' into fix_magic_method_abs…

…tract_class

.github/workflows/ci.yml

@@ -135,6 +135,7 @@ jobs:
       CHUNK_COUNT: "${{ matrix.count }}"
       CHUNK_NUMBER: "${{ matrix.chunk }}"
       PARALLEL_PROCESSES: 5
+      BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
     steps:
       - name: Set up PHP

.github/workflows/windows-ci.yml

@@ -55,10 +55,12 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.1'
-          ini-values: zend.assertions=1, assert.exception=1, opcache.enable_cli=1, opcache.jit=function, opcache.jit_buffer_size=512M
+          #ini-values: zend.assertions=1, assert.exception=1, opcache.enable_cli=1, opcache.jit=function, opcache.jit_buffer_size=512M
+          ini-values: zend.assertions=1, assert.exception=1
           tools: composer:v2
           coverage: none
-          extensions: none, curl, dom, filter, intl, json, libxml, mbstring, openssl, opcache, pcre, phar, reflection, simplexml, spl, tokenizer, xml, xmlwriter
+          #extensions: none, curl, dom, filter, intl, json, libxml, mbstring, openssl, opcache, pcre, phar, reflection, simplexml, spl, tokenizer, xml, xmlwriter
+          extensions: none, curl, dom, filter, intl, json, libxml, mbstring, openssl, pcre, phar, reflection, simplexml, spl, tokenizer, xml, xmlwriter
         env:
           fail-fast: true
 

UPGRADING.md

@@ -17,7 +17,7 @@
 
 - [BC] Class `Psalm\Issue\MixedInferredReturnType` was removed
 
-- [BC] Value of constant `Psalm\Type\TaintKindGroup::ALL_INPUT` changed to reflect new `TaintKind::INPUT_SLEEP` and `TaintKind::INPUT_XPATH` have been added. Accordingly, default values for `$taint` parameters of `Psalm\Codebase::addTaintSource()` and `Psalm\Codebase::addTaintSink()` have been changed as well.
+- [BC] Value of constant `Psalm\Type\TaintKindGroup::ALL_INPUT` changed to reflect new `TaintKind::INPUT_EXTRACT`, `TaintKind::INPUT_SLEEP` and `TaintKind::INPUT_XPATH` have been added. Accordingly, default values for `$taint` parameters of `Psalm\Codebase::addTaintSource()` and `Psalm\Codebase::addTaintSink()` have been changed as well.
 
 - [BC] Property `Config::$shepherd_host` was replaced with `Config::$shepherd_endpoint`
 

bin/test-with-real-projects.sh

@@ -26,6 +26,9 @@ collections)
 	git clone --depth=1 [email protected]:psalm/endtoend-test-collections.git
 	cd endtoend-test-collections
 	composer install
+	rm vendor/amphp/amp/lib/functions.php; touch vendor/amphp/amp/lib/functions.php;
+	rm vendor/amphp/amp/lib/Internal/functions.php; touch vendor/amphp/amp/lib/Internal/functions.php
+	rm vendor/amphp/byte-stream/lib/functions.php; touch vendor/amphp/byte-stream/lib/functions.php
 	"$PSALM" --monochrome --show-info=false
 	;;
 
@@ -36,7 +39,7 @@ psl)
 
 	git clone [email protected]:psalm/endtoend-test-psl.git
 	cd endtoend-test-psl
-	git checkout 2.3.x
+	git checkout 2.3.x_master
 	composer install
 	# Avoid conflicts with old psalm when running phar tests
 	rm -rf vendor/vimeo/psalm

bin/tests-github-actions.sh

@@ -3,13 +3,15 @@
 set -eu
 
 function get_seeded_random() {
-  openssl enc -aes-256-ctr -pass pass:"vimeo/psalm" -nosalt </dev/zero 2>/dev/null
+  local -r branch_name="$1"
+  openssl enc -aes-256-ctr -pass pass:"$branch_name" -nosalt </dev/zero 2>/dev/null
 }
 
 function run {
   local -r chunk_count="$1"
   local -r chunk_number="$2"
   local -r parallel_processes="$3"
+  local -r branch_name="$4"
 
   local -r phpunit_cmd='
 echo "::group::{}";
@@ -23,7 +25,7 @@ exit "$exit_code"'
 
   mkdir -p build/parallel/ build/phpunit/logs/
 
-  find tests -name '*Test.php' | shuf --random-source=<(get_seeded_random) > build/tests_all
+  find tests -name '*Test.php' | shuf --random-source=<(get_seeded_random "$branch_name") > build/tests_all
   # split incorrectly splits the lines by byte size, which means that the number of tests per file are as evenly distributed as possible
   #split --number="l/$chunk_number/$chunk_count" build/tests_all > build/tests_split
   local -r lines=$(wc -l <build/tests_all)
@@ -47,5 +49,6 @@ exit "$exit_code"'
 if [ -z "${CHUNK_COUNT:-}" ]; then echo "Did not find env var CHUNK_COUNT."; exit 1; fi
 if [ -z "${CHUNK_NUMBER:-}" ]; then echo "Did not find env var CHUNK_NUMBER."; exit 1; fi
 if [ -z "${PARALLEL_PROCESSES:-}" ]; then echo "Did not find env var PARALLEL_PROCESSES."; exit 1; fi
+if [ -z "${BRANCH_NAME:-}" ]; then echo "Did not find env var BRANCH_NAME."; exit 1; fi
 
-run "$CHUNK_COUNT" "$CHUNK_NUMBER" "$PARALLEL_PROCESSES"
+run "$CHUNK_COUNT" "$CHUNK_NUMBER" "$PARALLEL_PROCESSES" "$BRANCH_NAME"

composer.json

@@ -31,7 +31,7 @@
         "dnoegel/php-xdg-base-dir": "^0.1.1",
         "felixfbecker/advanced-json-rpc": "^3.1",
         "felixfbecker/language-server-protocol": "^1.5.2",
-        "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1",
+        "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0",
         "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
         "nikic/php-parser": "^4.16",
         "sebastian/diff": "^4.0 || ^5.0",
@@ -112,16 +112,16 @@
         "psalter"
     ],
     "scripts": {
-        "cs": "phpcs -ps",
-        "cs-fix": "phpcbf -ps",
-        "lint": "parallel-lint ./src ./tests",
+        "cs": "@php phpcs -ps",
+        "cs-fix": "@php phpcbf -ps",
+        "lint": "@php parallel-lint ./src ./tests",
         "phpunit": [
             "Composer\\Config::disableProcessTimeout",
             "paratest -f --runner=WrapperRunner"
         ],
         "phpunit-std": [
             "Composer\\Config::disableProcessTimeout",
-            "phpunit"
+            "@php phpunit"
         ],
         "verify-callmap": "@php phpunit tests/Internal/Codebase/InternalCallMapHandlerTest.php",
         "psalm": "@php ./psalm",

config.xsd

@@ -420,6 +420,7 @@
             <xs:element name="RedundantCastGivenDocblockType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="RedundantCondition" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="RedundantConditionGivenDocblockType" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="RedundantFlag" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="RedundantFunctionCall" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="RedundantFunctionCallGivenDocblockType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="RedundantIdentityWithTrue" type="IssueHandlerType" minOccurs="0" />
@@ -428,11 +429,13 @@
             <xs:element name="ReferenceReusedFromConfusingScope" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="ReservedWord" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="RiskyCast" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="RiskyTruthyFalsyComparison" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="StringIncrement" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="TaintedCallable" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="TaintedCookie" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="TaintedCustom" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="TaintedEval" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="TaintedExtract" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="TaintedFile" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="TaintedHeader" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="TaintedHtml" type="IssueHandlerType" minOccurs="0" />

dictionaries/CallMap.php

@@ -1552,7 +1552,7 @@
 'decbin' => ['string', 'num'=>'int'],
 'dechex' => ['string', 'num'=>'int'],
 'decoct' => ['string', 'num'=>'int'],
-'define' => ['bool', 'constant_name'=>'string', 'value'=>'mixed', 'case_insensitive='=>'bool'],
+'define' => ['bool', 'constant_name'=>'string', 'value'=>'array|scalar|null', 'case_insensitive='=>'false'],
 'define_syslog_variables' => ['void'],
 'defined' => ['bool', 'constant_name'=>'string'],
 'deflate_add' => ['string|false', 'context'=>'DeflateContext', 'data'=>'string', 'flush_mode='=>'int'],
@@ -2847,11 +2847,11 @@
 'FilesystemIterator::setInfoClass' => ['void', 'class='=>'class-string'],
 'FilesystemIterator::valid' => ['bool'],
 'filetype' => ['string|false', 'filename'=>'string'],
-'filter_has_var' => ['bool', 'input_type'=>'int', 'var_name'=>'string'],
+'filter_has_var' => ['bool', 'input_type'=>'0|1|2|4|5', 'var_name'=>'string'],
 'filter_id' => ['int|false', 'name'=>'string'],
-'filter_input' => ['mixed|false', 'type'=>'int', 'var_name'=>'string', 'filter='=>'int', 'options='=>'array|int'],
-'filter_input_array' => ['array|false|null', 'type'=>'int', 'options='=>'int|array', 'add_empty='=>'bool'],
-'filter_list' => ['array'],
+'filter_input' => ['mixed|false|null', 'type'=>'0|1|2|4|5', 'var_name'=>'string', 'filter='=>'int', 'options='=>'array|int'],
+'filter_input_array' => ['array|false|null', 'type'=>'0|1|2|4|5', 'options='=>'int|array', 'add_empty='=>'bool'],
+'filter_list' => ['non-empty-list<non-falsy-string>'],
 'filter_var' => ['mixed|false', 'value'=>'mixed', 'filter='=>'int', 'options='=>'array|int'],
 'filter_var_array' => ['array|false|null', 'array'=>'array', 'options='=>'array|int', 'add_empty='=>'bool'],
 'FilterIterator::__construct' => ['void', 'iterator'=>'Iterator'],
@@ -3315,7 +3315,7 @@
 'getopt' => ['array<string,string|false|list<string|false>>|false', 'short_options'=>'string', 'long_options='=>'array', '&w_rest_index='=>'int'],
 'getprotobyname' => ['int|false', 'protocol'=>'string'],
 'getprotobynumber' => ['string', 'protocol'=>'int'],
-'getrandmax' => ['int'],
+'getrandmax' => ['int<1, max>'],
 'getrusage' => ['array', 'mode='=>'int'],
 'getservbyname' => ['int|false', 'service'=>'string', 'protocol'=>'string'],
 'getservbyport' => ['string|false', 'port'=>'int', 'protocol'=>'string'],
@@ -6625,7 +6625,7 @@
 'mb_ereg_search_setpos' => ['bool', 'offset'=>'int'],
 'mb_eregi' => ['bool', 'pattern'=>'string', 'string'=>'string', '&w_matches='=>'array|null'],
 'mb_eregi_replace' => ['string|false|null', 'pattern'=>'string', 'replacement'=>'string', 'string'=>'string', 'options='=>'string|null'],
-'mb_get_info' => ['array|string|int|false', 'type='=>'string'],
+'mb_get_info' => ['array|string|int|false|null', 'type='=>'string'],
 'mb_http_input' => ['array|string|false', 'type='=>'string|null'],
 'mb_http_output' => ['string|bool', 'encoding='=>'string|null'],
 'mb_internal_encoding' => ['string|bool', 'encoding='=>'string|null'],
@@ -7646,7 +7646,7 @@
 'msql_query' => ['resource', 'query'=>'string', 'link_identifier='=>'?resource'],
 'msql_result' => ['string', 'result'=>'resource', 'row'=>'int', 'field='=>'mixed'],
 'msql_select_db' => ['bool', 'database_name'=>'string', 'link_identifier='=>'?resource'],
-'mt_getrandmax' => ['int'],
+'mt_getrandmax' => ['int<1, max>'],
 'mt_rand' => ['int', 'min'=>'int', 'max'=>'int'],
 'mt_rand\'1' => ['int'],
 'mt_srand' => ['void', 'seed='=>'?int', 'mode='=>'int'],
@@ -11141,8 +11141,8 @@
 'SessionIdInterface::create_sid' => ['string'],
 'SessionUpdateTimestampHandler::updateTimestamp' => ['bool', 'id'=>'string', 'data'=>'string'],
 'SessionUpdateTimestampHandler::validateId' => ['char', 'id'=>'string'],
-'SessionUpdateTimestampHandlerInterface::updateTimestamp' => ['bool', 'key'=>'string', 'value'=>'string'],
-'SessionUpdateTimestampHandlerInterface::validateId' => ['bool', 'key'=>'string'],
+'SessionUpdateTimestampHandlerInterface::updateTimestamp' => ['bool', 'id'=>'string', 'data'=>'string'],
+'SessionUpdateTimestampHandlerInterface::validateId' => ['bool', 'id'=>'string'],
 'set_error_handler' => ['null|callable(int,string,string=,int=,array=):bool', 'callback'=>'null|callable(int,string,string=,int=,array=):bool', 'error_levels='=>'int'],
 'set_exception_handler' => ['null|callable(Throwable):void', 'callback'=>'null|callable(Throwable):void'],
 'set_file_buffer' => ['int', 'stream'=>'resource', 'size'=>'int'],
@@ -12923,8 +12923,8 @@
 'strrpos' => ['int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int'],
 'strspn' => ['int', 'string'=>'string', 'characters'=>'string', 'offset='=>'int', 'length='=>'?int'],
 'strstr' => ['string|false', 'haystack'=>'string', 'needle'=>'string', 'before_needle='=>'bool'],
-'strtok' => ['string|false', 'string'=>'string', 'token'=>'string'],
-'strtok\'1' => ['string|false', 'string'=>'string'],
+'strtok' => ['non-empty-string|false', 'string'=>'string', 'token'=>'string'],
+'strtok\'1' => ['non-empty-string|false', 'string'=>'string'],
 'strtolower' => ['lowercase-string', 'string'=>'string'],
 'strtotime' => ['int|false', 'datetime'=>'string', 'baseTimestamp='=>'?int'],
 'strtoupper' => ['string', 'string'=>'string'],
@@ -14165,7 +14165,7 @@
 'unlink' => ['bool', 'filename'=>'string', 'context='=>'resource'],
 'unpack' => ['array|false', 'format'=>'string', 'string'=>'string', 'offset='=>'int'],
 'unregister_tick_function' => ['void', 'callback'=>'callable'],
-'unserialize' => ['mixed', 'data'=>'string', 'options='=>'array{allowed_classes?:string[]|bool}'],
+'unserialize' => ['mixed', 'data'=>'string', 'options='=>'array{allowed_classes?:class-string[]|bool}'],
 'unset' => ['void', 'var='=>'mixed', '...args='=>'mixed'],
 'untaint' => ['bool', '&rw_string'=>'string', '&...rw_strings='=>'string'],
 'uopz_allow_exit' => ['void', 'allow'=>'bool'],

dictionaries/CallMap_73_delta.php

@@ -64,6 +64,10 @@
       'old' => ['int', 'scale'=>'int'],
       'new' => ['int', 'scale='=>'int'],
     ],
+    'define' => [
+        'old' => ['bool', 'constant_name'=>'string', 'value'=>'array|scalar|null', 'case_insensitive='=>'bool'],
+        'new' => ['bool', 'constant_name'=>'string', 'value'=>'array|scalar|null', 'case_insensitive='=>'false'],
+    ],
     'ldap_compare' => [
       'old' => ['bool|int', 'ldap'=>'resource', 'dn'=>'string', 'attribute'=>'string', 'value'=>'string'],
       'new' => ['bool|int', 'ldap'=>'resource', 'dn'=>'string', 'attribute'=>'string', 'value'=>'string', 'controls='=>'array'],

dictionaries/CallMap_82_delta.php

@@ -53,6 +53,10 @@
        'old' => ['non-empty-list<string>', 'string'=>'string', 'length='=>'positive-int'],
        'new' => ['list<non-empty-string>', 'string'=>'string', 'length='=>'positive-int'],
     ],
+    'mb_get_info' => [
+        'old' => ['array|string|int|false', 'type='=>'string'],
+        'new' => ['array|string|int|false|null', 'type='=>'string'],
+    ],
   ],
 
   'removed' => [

dictionaries/CallMap_historical.php

@@ -6583,8 +6583,8 @@
     'SessionIdInterface::create_sid' => ['string'],
     'SessionUpdateTimestampHandler::updateTimestamp' => ['bool', 'id'=>'string', 'data'=>'string'],
     'SessionUpdateTimestampHandler::validateId' => ['char', 'id'=>'string'],
-    'SessionUpdateTimestampHandlerInterface::updateTimestamp' => ['bool', 'key'=>'string', 'value'=>'string'],
-    'SessionUpdateTimestampHandlerInterface::validateId' => ['bool', 'key'=>'string'],
+    'SessionUpdateTimestampHandlerInterface::updateTimestamp' => ['bool', 'id'=>'string', 'data'=>'string'],
+    'SessionUpdateTimestampHandlerInterface::validateId' => ['bool', 'id'=>'string'],
     'SimpleXMLElement::__construct' => ['void', 'data'=>'string', 'options='=>'int', 'dataIsURL='=>'bool', 'namespaceOrPrefix='=>'string', 'isPrefix='=>'bool'],
     'SimpleXMLElement::__get' => ['SimpleXMLElement', 'name'=>'string'],
     'SimpleXMLElement::__toString' => ['string'],
@@ -9937,7 +9937,7 @@
     'decbin' => ['string', 'num'=>'int'],
     'dechex' => ['string', 'num'=>'int'],
     'decoct' => ['string', 'num'=>'int'],
-    'define' => ['bool', 'constant_name'=>'string', 'value'=>'mixed', 'case_insensitive='=>'bool'],
+    'define' => ['bool', 'constant_name'=>'string', 'value'=>'array|scalar|null', 'case_insensitive='=>'bool'],
     'define_syslog_variables' => ['void'],
     'defined' => ['bool', 'constant_name'=>'string'],
     'deflate_add' => ['string|false', 'context'=>'resource', 'data'=>'string', 'flush_mode='=>'int'],
@@ -10434,11 +10434,11 @@
     'filepro_rowcount' => ['int'],
     'filesize' => ['int|false', 'filename'=>'string'],
     'filetype' => ['string|false', 'filename'=>'string'],
-    'filter_has_var' => ['bool', 'input_type'=>'int', 'var_name'=>'string'],
+    'filter_has_var' => ['bool', 'input_type'=>'0|1|2|4|5', 'var_name'=>'string'],
     'filter_id' => ['int|false', 'name'=>'string'],
-    'filter_input' => ['mixed|false', 'type'=>'int', 'var_name'=>'string', 'filter='=>'int', 'options='=>'array|int'],
-    'filter_input_array' => ['array|false|null', 'type'=>'int', 'options='=>'int|array', 'add_empty='=>'bool'],
-    'filter_list' => ['array'],
+    'filter_input' => ['mixed|false|null', 'type'=>'0|1|2|4|5', 'var_name'=>'string', 'filter='=>'int', 'options='=>'array|int'],
+    'filter_input_array' => ['array|false|null', 'type'=>'0|1|2|4|5', 'options='=>'int|array', 'add_empty='=>'bool'],
+    'filter_list' => ['non-empty-list<non-falsy-string>'],
     'filter_var' => ['mixed|false', 'value'=>'mixed', 'filter='=>'int', 'options='=>'array|int'],
     'filter_var_array' => ['array|false|null', 'array'=>'array', 'options='=>'array|int', 'add_empty='=>'bool'],
     'finfo::__construct' => ['void', 'flags='=>'int', 'magic_database='=>'string'],
@@ -10679,7 +10679,7 @@
     'getopt' => ['array<string,string|false|list<string|false>>|false', 'short_options'=>'string', 'long_options='=>'array'],
     'getprotobyname' => ['int|false', 'protocol'=>'string'],
     'getprotobynumber' => ['string', 'protocol'=>'int'],
-    'getrandmax' => ['int'],
+    'getrandmax' => ['int<1, max>'],
     'getrusage' => ['array', 'mode='=>'int'],
     'getservbyname' => ['int|false', 'service'=>'string', 'protocol'=>'string'],
     'getservbyport' => ['string|false', 'port'=>'int', 'protocol'=>'string'],
@@ -12488,7 +12488,7 @@
     'msql_query' => ['resource', 'query'=>'string', 'link_identifier='=>'?resource'],
     'msql_result' => ['string', 'result'=>'resource', 'row'=>'int', 'field='=>'mixed'],
     'msql_select_db' => ['bool', 'database_name'=>'string', 'link_identifier='=>'?resource'],
-    'mt_getrandmax' => ['int'],
+    'mt_getrandmax' => ['int<1, max>'],
     'mt_rand' => ['int', 'min'=>'int', 'max'=>'int'],
     'mt_rand\'1' => ['int'],
     'mt_srand' => ['void', 'seed='=>'int', 'mode='=>'int'],
@@ -14333,8 +14333,8 @@
     'strrpos' => ['int|false', 'haystack'=>'string', 'needle'=>'string|int', 'offset='=>'int'],
     'strspn' => ['int', 'string'=>'string', 'characters'=>'string', 'offset='=>'int', 'length='=>'int'],
     'strstr' => ['string|false', 'haystack'=>'string', 'needle'=>'string|int', 'before_needle='=>'bool'],
-    'strtok' => ['string|false', 'string'=>'string', 'token'=>'string'],
-    'strtok\'1' => ['string|false', 'string'=>'string'],
+    'strtok' => ['non-empty-string|false', 'string'=>'string', 'token'=>'string'],
+    'strtok\'1' => ['non-empty-string|false', 'string'=>'string'],
     'strtolower' => ['lowercase-string', 'string'=>'string'],
     'strtotime' => ['int|false', 'datetime'=>'string', 'baseTimestamp='=>'int'],
     'strtoupper' => ['string', 'string'=>'string'],
@@ -15197,7 +15197,7 @@
     'unlink' => ['bool', 'filename'=>'string', 'context='=>'resource'],
     'unpack' => ['array', 'format'=>'string', 'string'=>'string'],
     'unregister_tick_function' => ['void', 'callback'=>'callable'],
-    'unserialize' => ['mixed', 'data'=>'string', 'options='=>'array{allowed_classes?:string[]|bool}'],
+    'unserialize' => ['mixed', 'data'=>'string', 'options='=>'array{allowed_classes?:class-string[]|bool}'],
     'unset' => ['void', 'var='=>'mixed', '...args='=>'mixed'],
     'untaint' => ['bool', '&rw_string'=>'string', '&...rw_strings='=>'string'],
     'uopz_allow_exit' => ['void', 'allow'=>'bool'],

docs/annotating_code/supported_annotations.md

@@ -263,9 +263,9 @@ is not within the given namespace.
 <?php
 namespace A\B {
     /**
-    * @internal
-    * @psalm-internal A\B
-    */
+     * @internal
+     * @psalm-internal A\B
+     */
     class Foo { }
 }