Merge branch '2.0.x' into get-defined-vars

Author: MartinMystikJonas

.github/workflows/e2e-tests.yml

@@ -229,6 +229,10 @@ jobs:
               echo "$OUTPUT"
               ../bashunit -a contains 'Child process error (exit code 255): PHP Fatal error' "$OUTPUT"
               ../bashunit -a contains 'Result is incomplete because of severe errors.' "$OUTPUT"
+          - script: |
+              cd e2e/bug-11857
+              composer install
+              ../../bin/phpstan
 
     steps:
       - name: "Checkout"
@@ -249,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 }}"
@@ -292,6 +296,48 @@ jobs:
           - script: |
               cd e2e/bug-11819
               ../../bin/phpstan
+          - 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"
@@ -308,5 +354,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/phar.yml

@@ -103,14 +103,14 @@ jobs:
 
       - name: "Delete checksum PHAR"
         run: "rm tmp/phpstan.phar"
-#
-#  integration-tests:
-#    if: github.event_name == 'pull_request'
-#    needs: compiler-tests
-#    uses: phpstan/phpstan/.github/workflows/integration-tests.yml@2.0.x
-#    with:
-#      ref: 2.0.x
-#      phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
+
+  integration-tests:
+    if: github.event_name == 'pull_request'
+    needs: compiler-tests
+    uses: phpstan/phpstan/.github/workflows/integration-tests.yml@2.0.x
+    with:
+      ref: 2.0.x
+      phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   extension-tests:
     if: github.event_name == 'pull_request'
@@ -211,9 +211,6 @@ jobs:
         env:
           GPG_ID: ${{ steps.import-gpg.outputs.fingerprint }}
 
-      - name: "cp UPGRADING.md"
-        run: cp phpstan-src/UPGRADING.md phpstan-dist/UPGRADING.md
-
       - name: "Verify PHAR"
         working-directory: phpstan-dist
         run: "gpg --verify phpstan.phar.asc"

UPGRADING.md

@@ -112,10 +112,6 @@ Appending `(?)` in `ignoreErrors` is not supported.
   * `constant_hassers` -> use `constantHassers`
   * `console_application_loader` -> use `consoleApplicationLoader`
 
-### Docker images no longer tagged without a PHP version
-
-Tags without a PHP version are no longer published - `nightly`, `2`, `latest` are no longer updated. Instead, use `nightly-php8.3`, `2-php8.3`, `latest-php8.3`. You can replace `8.3` with PHP versions `8.0`-`8.3`.
-
 ### Minor backward compatibility breaks
 
 * Removed unused config parameter `cache.nodesByFileCountMax`