Merge branch 'master' into php84

.circleci/config.yml

@@ -2,12 +2,6 @@
 # See https://app.circleci.com/pipelines/github/vimeo/psalm
 version: 2.1
 executors:
-  php-74:
-    docker:
-      - image: thecodingmachine/php:7.4-v4-cli
-  php-80:
-    docker:
-      - image: thecodingmachine/php:8.0-v4-cli
   php-81:
     docker:
       - image: thecodingmachine/php:8.1-v4-cli
@@ -16,7 +10,7 @@ executors:
       - image: thecodingmachine/php:8.2-v4-cli
 jobs:
   "Code Style Analysis":
-    executor: php-74
+    executor: php-81
     steps:
       - checkout
 
@@ -44,7 +38,7 @@ jobs:
           command: vendor/bin/phpcs -d memory_limit=512M
 
   phar-build:
-    executor: php-74
+    executor: php-81
     steps:
       - attach_workspace:
           at: /home/docker/project/

.github/workflows/build-phar.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.1'
           tools: composer:v2
           coverage: none
         env:

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.1'
           tools: composer:v2
           coverage: none
         env:
@@ -32,6 +32,12 @@ jobs:
         env:
           COMPOSER_ROOT_VERSION: dev-master
 
+      - name: Check all classes are autoloadable
+        run: |
+          composer dump-autoload -o --strict-psr
+        env:
+          COMPOSER_ROOT_VERSION: dev-master
+
       - name: Cache composer cache
         uses: actions/cache@v4
         with:
@@ -57,7 +63,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.1'
           tools: composer:v2
           coverage: none
         env:
@@ -125,7 +131,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"

.github/workflows/macos-scan.yml

@@ -0,0 +1,29 @@
+name: Run Psalm (mac OS)
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: macos-15
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.4'
+        ini-values: zend.assertions=1
+        tools: composer:v2
+        coverage: none
+      env:
+        fail-fast: true
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress --no-suggest
+      env:
+        COMPOSER_ROOT_VERSION: dev-master
+
+    - name: Run Psalm
+      run: ./psalm --output-format=github --force-jit

.github/workflows/shepherd.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.2'
+        php-version: '8.4'
         ini-values: zend.assertions=1
         tools: composer:v2
         coverage: none
@@ -26,4 +26,4 @@ jobs:
         COMPOSER_ROOT_VERSION: dev-master
 
     - name: Run Psalm
-      run: ./psalm --threads=2 --output-format=github --shepherd
+      run: ./psalm --output-format=github --shepherd --force-jit

.github/workflows/windows-ci.yml

@@ -54,14 +54,21 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
-          ini-values: zend.assertions=1, assert.exception=1, opcache.enable_cli=1, opcache.jit=function, opcache.jit_buffer_size=512M
+          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
           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
 
+      - name: PHP Version
+        run: |
+          php -v
+          php -r 'var_dump(PHP_VERSION_ID);'
+
       - uses: actions/checkout@v4
 
       - name: Get Composer Cache Directories

UPGRADING.md

@@ -1,13 +1,59 @@
 # Upgrading from Psalm 5 to Psalm 6
 ## Changed
 
+- The minimum PHP version was raised to PHP 8.1.17.
+
+- [BC] The configuration settings `ignoreInternalFunctionFalseReturn` and `ignoreInternalFunctionNullReturn` are now defaulted to `false`
+
 - [BC] Switched the internal representation of `list<T>` and `non-empty-list<T>` from the TList and TNonEmptyList classes to an unsealed list shape: the TList, TNonEmptyList and TCallableList classes were removed.
   Nothing will change for users: the `list<T>` and `non-empty-list<T>` syntax will remain supported and its semantics unchanged.
   Psalm 5 already deprecates the `TList`, `TNonEmptyList` and `TCallableList` classes: use `\Psalm\Type::getListAtomic`, `\Psalm\Type::getNonEmptyListAtomic` and `\Psalm\Type::getCallableListAtomic` to instantiate list atomics, or directly instantiate TKeyedArray objects with `is_list=true` where appropriate.
 
 - [BC] The only optional boolean parameter of `TKeyedArray::getGenericArrayType` was removed, and was replaced with a string parameter with a different meaning.
 
 - [BC] The `TDependentListKey` type was removed and replaced with an optional property of the `TIntRange` type.
+- 
+- [BC] `TCallableArray` and `TCallableList` removed and replaced with `TCallableKeyedArray`.
+
+- [BC] Class `Psalm\Issue\MixedInferredReturnType` was removed
+
+- [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`
+
+- [BC] Methods `Codebase::getSymbolLocation()` and `Codebase::getSymbolInformation()` were replaced with `Codebase::getSymbolLocationByReference()`
+
+- [BC] Method `Psalm\Type\Atomic\TKeyedArray::getList()` was removed
+
+- [BC] Method `Psalm\Storage\FunctionLikeStorage::getSignature()` was replaced with `FunctionLikeStorage::getCompletionSignature()`
+
+- [BC] Property `Psalm\Storage\FunctionLikeStorage::$unused_docblock_params` was replaced with `FunctionLikeStorage::$unused_docblock_parameters`
+
+- [BC] Method `Plugin\Shepherd::getCurlErrorMessage()` was removed
+
+- [BC] Property `Config::$find_unused_code` changed default value from false to true
+
+- [BC] Property `Config::$find_unused_baseline_entry` changed default value from false to true
+
+- [BC] The return type of `Psalm\Internal\LanguageServer\ProtocolWriter#write() changed from `Amp\Promise` to `void` due to the switch to Amp v3
+
+- [BC] All parameters, properties and return typehints are now strictly typed.
+
+- [BC] `strict_types` is now applied to all files of the Psalm codebase.
+
+- [BC] Properties `Psalm\Type\Atomic\TLiteralFloat::$value` and `Psalm\Type\Atomic\TLiteralInt::$value` became typed (`float` and `int` respectively)
+
+- [BC] Property `Psalm\Storage\EnumCaseStorage::$value` changed from `int|string|null` to `TLiteralInt|TLiteralString|null`
+
+- [BC] `Psalm\CodeLocation\Raw`, `Psalm\CodeLocation\ParseErrorLocation`, `Psalm\CodeLocation\DocblockTypeLocation`, `Psalm\Report\CountReport`, `Psalm\Type\Atomic\TNonEmptyArray` are now all final.
+
+- [BC] `Psalm\Config` is now final.
+
+- [BC] The return type of `Psalm\Plugin\ArgTypeInferer::infer` changed from `Union|false` to `Union|null`
+
+- [BC] The `extra_types` property and `setIntersectionTypes` method of `Psalm\Type\Atomic\TTypeAlias` were removed.
+
+- [BC] Methods `convertSeverity` and `calculateFingerprint` of `Psalm\Report\CodeClimateReport` were removed.
 
 # Upgrading from Psalm 4 to Psalm 5
 ## Changed

bin/generate_issues_list_doc.php

@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+declare(strict_types=1);
+
 $docs_dir = dirname(__DIR__) . DIRECTORY_SEPARATOR . "docs"
     . DIRECTORY_SEPARATOR . "running_psalm" . DIRECTORY_SEPARATOR;
 $issues_index = "{$docs_dir}issues.md";

bin/generate_levels_doc.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Psalm\Config\IssueHandler;
 use Psalm\Issue\CodeIssue;
 

bin/generate_testsuites.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 if (count($argv) < 2) {
     fwrite(STDERR, 'Usage: ' . $argv[0] . ' <number_of_chunks>' . PHP_EOL);
     exit(1);
@@ -35,7 +37,7 @@
 );
 array_multisort($order, $files);
 
-$chunks = array_chunk($files, ceil(count($files) / $number_of_chunks));
+$chunks = array_chunk($files, (int) ceil(count($files) / $number_of_chunks));
 
 $phpunit_config = new DOMDocument('1.0', 'UTF-8');
 $phpunit_config->preserveWhiteSpace = false;

bin/improve_class_alias.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $vendor_path = 'vendor-bin/box/vendor/humbug/php-scoper/src/PhpParser/NodeVisitor/ClassAliasStmtAppender.php';
 
 if (!file_exists($vendor_path)) {

bin/max_used_shortcode.php

@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+declare(strict_types=1);
+
 use Psalm\Config\IssueHandler;
 
 require_once(dirname(__DIR__) . '/vendor/autoload.php');

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,11 +39,13 @@ 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
 	sed 's/ErrorOutputBehavior::Packed, ErrorOutputBehavior::Discard/ErrorOutputBehavior::Discard/g' -i src/Psl/Shell/execute.php
-	"$PSALM" --monochrome -c config/psalm.xml
-	"$PSALM" --monochrome -c config/psalm.xml tests/static-analysis
+	"$PSALM_PHAR" --monochrome -c config/psalm.xml
+	"$PSALM_PHAR" --monochrome -c config/psalm.xml tests/static-analysis
 	;;
 
 laravel)

bin/update-property-map.php

@@ -93,9 +93,9 @@ function extractClassesFromStatements(array $statements): array
 foreach ($files as $file) {
     $contents = file_get_contents($file);
     // FIXME: find a way to ignore custom entities, for now we strip them.
-    $contents = preg_replace('#&[a-zA-Z\d.\-_]+;#', '', $contents);
-    $contents = preg_replace('#%[a-zA-Z\d.\-_]+;#', '', $contents);
-    $contents = preg_replace('#<!ENTITY[^>]+>#', '', $contents);
+    $contents = (string) preg_replace('#&[a-zA-Z\d.\-_]+;#', '', $contents);
+    $contents = (string) preg_replace('#%[a-zA-Z\d.\-_]+;#', '', $contents);
+    $contents = (string) preg_replace('#<!ENTITY[^>]+>#', '', $contents);
     try {
         $simple = new SimpleXMLElement($contents);
     } catch (Throwable $exception) {

composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "php": "~8.1.17 || ~8.2.4 || ~8.3.0 || ~8.4.0",
         "ext-SimpleXML": "*",
         "ext-ctype": "*",
         "ext-dom": "*",
@@ -24,32 +24,30 @@
         "ext-mbstring": "*",
         "ext-tokenizer": "*",
         "composer-runtime-api": "^2",
-        "amphp/amp": "^2.4.2",
-        "amphp/byte-stream": "^1.5",
+        "amphp/amp": "^3",
+        "amphp/byte-stream": "^2",
         "composer/semver": "^1.4 || ^2.0 || ^3.0",
         "composer/xdebug-handler": "^2.0 || ^3.0",
         "dnoegel/php-xdg-base-dir": "^0.1.1",
         "felixfbecker/advanced-json-rpc": "^3.1",
         "felixfbecker/language-server-protocol": "^1.5.3",
         "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.17",
+        "nikic/php-parser": "^5.0.0",
         "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
         "spatie/array-to-xml": "^2.17.0 || ^3.0",
         "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0",
         "symfony/filesystem": "^5.4 || ^6.0 || ^7.0"
     },
-    "conflict": {
-      "nikic/php-parser": "4.17.0"
-    },
     "provide": {
         "psalm/psalm": "self.version"
     },
     "require-dev": {
         "ext-curl": "*",
-        "amphp/phpunit-util": "^2.0.1",
+        "amphp/phpunit-util": "^3",
         "bamarni/composer-bin-plugin": "^1.4",
         "brianium/paratest": "^6.9",
+        "dg/bypass-finals": "^1.5",
         "mockery/mockery": "^1.5",
         "nunomaduro/mock-final-classes": "^1.1",
         "php-parallel-lint/php-parallel-lint": "^1.2",
@@ -77,7 +75,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.x-dev",
+            "dev-master": "6.x-dev",
+            "dev-5.x": "5.x-dev",
             "dev-4.x": "4.x-dev",
             "dev-3.x": "3.x-dev",
             "dev-2.x": "2.x-dev",
@@ -109,15 +108,15 @@
         "lint": "@php parallel-lint ./src ./tests",
         "phpunit": [
             "Composer\\Config::disableProcessTimeout",
-            "@php paratest --runner=WrapperRunner"
+            "paratest -f --runner=WrapperRunner"
         ],
         "phpunit-std": [
             "Composer\\Config::disableProcessTimeout",
             "@php phpunit"
         ],
         "verify-callmap": "@php phpunit tests/Internal/Codebase/InternalCallMapHandlerTest.php",
         "psalm": "@php ./psalm",
-        "psalm-set-baseline": "@php ./psalm --set-baseline=psalm-baseline.xml",
+        "psalm-set-baseline": "@php ./psalm --set-baseline",
         "tests": [
             "@lint",
             "@cs",
@@ -135,8 +134,8 @@
         "tests": "Runs all available tests."
     },
     "support": {
-      "docs": "https://psalm.dev/docs",
-      "issues": "https://github.com/vimeo/psalm/issues",
-      "source": "https://github.com/vimeo/psalm"
+        "docs": "https://psalm.dev/docs",
+        "issues": "https://github.com/vimeo/psalm/issues",
+        "source": "https://github.com/vimeo/psalm"
     }
 }