Introduce isDeprecated to CallableParametersAcceptor

.github/workflows/apiref.yml

@@ -6,13 +6,16 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - "2.0.x"
+      - "2.1.x"
     paths:
       - 'src/**'
       - 'composer.lock'
       - 'apigen/**'
       - '.github/workflows/apiref.yml'
 
+env:
+  COMPOSER_ROOT_VERSION: "2.1.x-dev"
+
 concurrency:
   group: apigen-${{ github.ref }} # will be canceled on subsequent pushes in branch
   cancel-in-progress: true

.github/workflows/backward-compatibility.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
     paths:
       - 'src/**'
       - '.github/workflows/backward-compatibility.yml'

.github/workflows/build-issue-bot.yml

@@ -9,7 +9,7 @@ on:
       - '.github/workflows/build-issue-bot.yml'
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
     paths:
       - 'issue-bot/**'
       - '.github/workflows/build-issue-bot.yml'

.github/workflows/changelog-generator.yml

@@ -9,7 +9,7 @@ on:
       - '.github/workflows/changelog-generator.yml'
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
     paths:
       - 'changelog-generator/**'
       - '.github/workflows/changelog-generator.yml'

.github/workflows/checksum-phar.yml

@@ -12,7 +12,7 @@ on:
       - '.github/workflows/checksum-phar.yml'
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
     paths:
       - 'compiler/**'
       - '.github/workflows/checksum-phar.yml'
@@ -34,7 +34,7 @@ jobs:
         with:
           repository: phpstan/phpstan
           path: phpstan-dist
-          ref: 1.12.x
+          ref: 2.0.x
 
       - name: "Get info"
         id: info
@@ -98,14 +98,14 @@ jobs:
       - name: "Composer dump"
         run: "composer install --no-interaction --no-progress"
         env:
-          COMPOSER_ROOT_VERSION: "1.12.x-dev"
+          COMPOSER_ROOT_VERSION: "2.0.x-dev"
 
       - name: "Compile PHAR for checksum"
         working-directory: "compiler/build"
         run: "php box.phar compile --no-parallel"
         env:
           PHAR_CHECKSUM: "1"
-          COMPOSER_ROOT_VERSION: "1.12.x-dev"
+          COMPOSER_ROOT_VERSION: "2.0.x-dev"
 
       - name: "Re-sign PHAR"
         run: "php compiler/build/resign.php tmp/phpstan.phar"

.github/workflows/e2e-tests.yml

@@ -11,7 +11,7 @@ on:
       - 'issue-bot/**'
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'
@@ -23,36 +23,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  result-cache-php-parser-e2e:
-    name: "Result cache PHP-Parser E2E test"
-
-    runs-on: ${{ matrix.operating-system }}
-    timeout-minutes: 60
-
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest]
-
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v4
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "8.1"
-          extensions: mbstring
-          ini-values: memory_limit=256M
-
-      - name: "Install dependencies"
-        run: "composer install --no-interaction --no-progress"
-
-      - name: "Tests"
-        run: |
-          git clone https://github.com/nikic/PHP-Parser.git tests/e2e/PHP-Parser && git -C tests/e2e/PHP-Parser checkout v3.1.5 && composer install --working-dir tests/e2e/PHP-Parser && vendor/bin/phpunit tests/e2e/ResultCacheEndToEndTest.php
-
   result-cache-e2e-tests:
     name: "Result cache E2E tests"
     runs-on: ubuntu-latest
@@ -167,17 +137,18 @@ jobs:
               ../../bin/phpstan -vvv
           - script: |
               cd e2e/env-parameter
-              export PHPSTAN_SCOPE_CLASS=MyTestScope
-              ACTUAL=$(../../bin/phpstan dump-parameters -c phpstan.neon --json -l 9 | jq --raw-output '.scopeClass')
-              [[ "$ACTUAL" == "MyTestScope" ]];
+              export PHPSTAN_RESULT_CACHE_PATH=/some/path
+              ACTUAL=$(../../bin/phpstan dump-parameters -c phpstan.neon --json -l 9 | jq --raw-output '.resultCachePath')
+              [[ "$ACTUAL" == "/some/path" ]];
           - script: |
               cd e2e/result-cache-8
               composer install
               ../../bin/phpstan
               echo -en '\n' >> build/CustomRule.php
-              OUTPUT=$(../../bin/phpstan 2>&1)
-              grep 'Result cache might not behave correctly' <<< "$OUTPUT"
-              grep 'ResultCache8E2E\\CustomRule' <<< "$OUTPUT"
+              OUTPUT=$(../../bin/phpstan analyze 2>&1 || true)
+              echo "$OUTPUT"
+              ../bashunit -a contains 'Result cache might not behave correctly' "$OUTPUT"
+              ../bashunit -a contains 'ResultCache8E2E\CustomRule' "$OUTPUT"
           - script: |
               cd e2e/env-int-key
               env 1=1 ../../bin/phpstan analyse test.php
@@ -189,49 +160,52 @@ jobs:
               cd e2e/trait-caching
               ../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/
               patch -b data/TraitOne.php < TraitOne.patch
-              OUTPUT=$(../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/ || true)
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/")
               echo "$OUTPUT"
-              ../bashunit -a line_count 1 "$OUTPUT"
+              ../bashunit -a line_count 2 "$OUTPUT"
+              ../bashunit -a matches "Note: Using configuration file .+phpstan.neon." "$OUTPUT"
               ../bashunit -a contains 'Method TraitsCachingIssue\TestClassUsingTrait::doBar() should return stdClass but returns Exception.' "$OUTPUT"
           - script: |
               cd e2e/trait-caching
               ../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/
               patch -b data/TraitTwo.php < TraitTwo.patch
-              OUTPUT=$(../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/ || true)
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/")
               echo "$OUTPUT"
-              ../bashunit -a line_count 1 "$OUTPUT"
+              ../bashunit -a line_count 2 "$OUTPUT"
+              ../bashunit -a matches "Note: Using configuration file .+phpstan.neon." "$OUTPUT"
               ../bashunit -a contains 'Method class@anonymous/TestClassUsingTrait.php:20::doBar() should return stdClass but returns Exception.' "$OUTPUT"
           - script: |
               cd e2e/trait-caching
               ../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/
               patch -b data/TraitOne.php < TraitOne.patch
               patch -b data/TraitTwo.php < TraitTwo.patch
-              OUTPUT=$(../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/ || true)
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/")
               echo "$OUTPUT"
-              ../bashunit -a line_count 2 "$OUTPUT"
+              ../bashunit -a line_count 3 "$OUTPUT"
+              ../bashunit -a matches "Note: Using configuration file .+phpstan.neon." "$OUTPUT"
               ../bashunit -a contains 'Method TraitsCachingIssue\TestClassUsingTrait::doBar() should return stdClass but returns Exception.' "$OUTPUT"
               ../bashunit -a contains 'Method class@anonymous/TestClassUsingTrait.php:20::doBar() should return stdClass but returns Exception.' "$OUTPUT"
           - script: |
               cd e2e/bad-exclude-paths
-              OUTPUT=$(../../bin/phpstan analyse -c ignore.neon 2>&1 || true)
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -c ignore.neon")
               echo "$OUTPUT"
               ../bashunit -a contains 'Invalid entry in ignoreErrors' "$OUTPUT"
               ../bashunit -a contains 'tests is neither a directory, nor a file path, nor a fnmatch pattern.' "$OUTPUT"
           - script: |
               cd e2e/bad-exclude-paths
-              OUTPUT=$(../../bin/phpstan analyse -c phpneon.php 2>&1 || true)
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -c phpneon.php")
               echo "$OUTPUT"
               ../bashunit -a contains 'Invalid entry in ignoreErrors' "$OUTPUT"
               ../bashunit -a contains 'src/test.php is neither a directory, nor a file path, nor a fnmatch pattern.' "$OUTPUT"
           - script: |
               cd e2e/bad-exclude-paths
-              OUTPUT=$(../../bin/phpstan analyse -c excludePaths.neon 2>&1 || true)
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -c excludePaths.neon")
               echo "$OUTPUT"
               ../bashunit -a contains 'Invalid entry in excludePaths' "$OUTPUT"
               ../bashunit -a contains 'tests is neither a directory, nor a file path, nor a fnmatch pattern.' "$OUTPUT"
           - script: |
               cd e2e/bad-exclude-paths
-              OUTPUT=$(../../bin/phpstan analyse -c phpneon2.php 2>&1 || true)
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -c phpneon2.php")
               echo "$OUTPUT"
               ../bashunit -a contains 'Invalid entry in excludePaths' "$OUTPUT"
               ../bashunit -a contains 'src/test.php is neither a directory, nor a file path, nor a fnmatch pattern.' "$OUTPUT"
@@ -279,7 +253,7 @@ jobs:
         run: "patch src/Analyser/Error.php < e2e/PHPStanErrorPatch.patch"
 
       - name: "Install bashunit"
-        run: "curl -s https://bashunit.typeddevs.com/install.sh | bash -s e2e/ 0.17.0"
+        run: "curl -s https://bashunit.typeddevs.com/install.sh | bash -s e2e/ 0.18.0"
 
       - name: "Test"
         run: "${{ matrix.script }}"
@@ -322,6 +296,52 @@ jobs:
           - script: |
               cd e2e/bug-11819
               ../../bin/phpstan
+          - script: |
+              cd e2e/composer-and-phpstan-version-config
+              composer install --ignore-platform-reqs
+              ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/composer-max-version
+              composer install
+              ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/composer-min-max-version
+              composer install
+              ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/composer-min-open-end-version
+              composer install
+              ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/composer-min-version-v5
+              composer install --ignore-platform-reqs
+              ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/composer-min-version-v7
+              composer install --ignore-platform-reqs
+              ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/composer-min-version
+              composer install
+              ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/composer-no-versions
+              composer install
+              ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/composer-version-config-invalid
+              OUTPUT=$(../bashunit -a exit_code "1" ../../bin/phpstan)
+              echo "$OUTPUT"
+              ../bashunit -a contains 'Invalid configuration' "$OUTPUT"
+              ../bashunit -a contains 'Invalid PHP version range: phpVersion.max should be greater or equal to phpVersion.min.' "$OUTPUT"
+          - script: |
+              cd e2e/composer-version-config-patch
+              composer install --ignore-platform-reqs
+              ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/composer-version-config
+              composer install
+              ../../bin/phpstan analyze test.php --level=0
 
     steps:
       - name: "Checkout"
@@ -338,5 +358,8 @@ jobs:
       - name: "Install dependencies"
         run: "composer install --no-interaction --no-progress"
 
+      - name: "Install bashunit"
+        run: "curl -s https://bashunit.typeddevs.com/install.sh | bash -s e2e/ 0.18.0"
+
       - name: "Test"
         run: ${{ matrix.script }}

.github/workflows/issue-bot.yml

@@ -11,7 +11,7 @@ on:
       - 'changelog-generator/**'
   push:
     branches:
-      - "2.0.x"
+      - "2.1.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'
@@ -106,9 +106,6 @@ jobs:
           attempt_limit: 5
           attempt_delay: 1000
 
-      - name: "Add level 10 config file"
-        run: "cp issue-bot/config.level10.neon conf/"
-
       - name: "Run PHPStan"
         working-directory: "issue-bot"
         timeout-minutes: 5
@@ -167,7 +164,7 @@ jobs:
 
       - name: "Evaluate results - push"
         working-directory: "issue-bot"
-        if: "github.repository_owner == 'phpstan' && github.ref == 'refs/heads/2.0.x'"
+        if: "github.repository_owner == 'phpstan' && github.ref == 'refs/heads/2.1.x'"
         env:
           GITHUB_PAT: ${{ secrets.PHPSTAN_BOT_TOKEN }}
           PHPSTAN_SRC_COMMIT_BEFORE: ${{ github.event.before }}

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
 
 concurrency:
   group: lint-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
@@ -22,8 +22,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
@@ -118,7 +116,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "8.3"
+          php-version: "8.4"
 
       - name: "Install dependencies"
         run: "composer install --no-interaction --no-progress"