Merge branch 'master' into patch-2

.github/workflows/backward-compatibility.yml

@@ -9,7 +9,7 @@ on:
       - "master"
 
 env:
-  COMPOSER_ROOT_VERSION: "1.0.x-dev"
+  COMPOSER_ROOT_VERSION: "1.3.x-dev"
 
 jobs:
   backward-compatibility:
@@ -31,13 +31,13 @@ jobs:
           php-version: "8.0"
 
       - name: "Install dependencies"
-        run: "composer install --no-dev --no-interaction --no-progress --no-suggest"
+        run: "composer install --no-dev --no-interaction --no-progress"
 
       - name: "Install BackwardCompatibilityCheck"
         run: |
           composer global config minimum-stability dev
           composer global config prefer-stable true
-          composer global require --dev ondrejmirtes/backward-compatibility-check:^5.0.7
+          composer global require --dev ondrejmirtes/backward-compatibility-check:^5.0.8
 
       - name: "Check"
         run: "$(composer global config bin-dir --absolute)/roave-backward-compatibility-check"

.github/workflows/compiler-tests.yml

@@ -9,7 +9,7 @@ on:
       - "master"
 
 env:
-  COMPOSER_ROOT_VERSION: "1.0.x-dev"
+  COMPOSER_ROOT_VERSION: "1.3.x-dev"
 
 jobs:
   compiler-tests:
@@ -29,10 +29,7 @@ jobs:
           php-version: "8.0"
 
       - name: "Install dependencies"
-        run: "composer install --no-dev --no-interaction --no-progress --no-suggest"
-
-      - name: "Transform source code"
-        run: php bin/transform-source.php
+        run: "composer install --no-interaction --no-progress"
 
       - name: "Tests"
         run: |
@@ -45,5 +42,19 @@ jobs:
 
       - uses: actions/upload-artifact@v2
         with:
-          name: phpstan.phar
+          name: phar-file
           path: tmp/phpstan.phar
+
+  integration-tests:
+    if: github.event_name == 'pull_request'
+    needs: compiler-tests
+    uses: phpstan/phpstan/.github/workflows/integration-tests.yml@master
+    with:
+      ref: master
+
+  extension-tests:
+    if: github.event_name == 'pull_request'
+    needs: compiler-tests
+    uses: phpstan/phpstan/.github/workflows/extension-tests.yml@master
+    with:
+      ref: master

.github/workflows/e2e-tests.yml

@@ -9,7 +9,7 @@ on:
       - "master"
 
 env:
-  COMPOSER_ROOT_VERSION: "1.0.x-dev"
+  COMPOSER_ROOT_VERSION: "1.3.x-dev"
 
 jobs:
   result-cache-e2e-tests:
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
         operating-system: [ubuntu-latest, windows-latest]
 
     steps:
@@ -38,7 +38,7 @@ jobs:
           ini-values: memory_limit=256M
 
       - name: "Install dependencies"
-        run: "composer install --no-interaction --no-progress --no-suggest"
+        run: "composer install --no-interaction --no-progress"
 
       - name: "Tests"
         run: |
@@ -70,12 +70,12 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "7.4"
+          php-version: "8.0"
           tools: ${{ matrix.tools }}
           extensions: ${{ matrix.extensions }}
 
       - name: "Install dependencies"
-        run: "composer install --no-interaction --no-progress --no-suggest"
+        run: "composer install --no-interaction --no-progress"
 
       - name: "Test"
         run: ${{ matrix.script }}

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ on:
       - "master"
 
 env:
-  COMPOSER_ROOT_VERSION: "1.0.x-dev"
+  COMPOSER_ROOT_VERSION: "1.3.x-dev"
 
 jobs:
   lint:
@@ -26,6 +26,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout"
@@ -41,11 +42,25 @@ jobs:
         run: "composer validate"
 
       - name: "Install dependencies"
-        run: "composer install --no-interaction --no-progress --no-suggest"
+        run: "composer install --no-interaction --no-progress"
+
+      - name: "Install PHP for code transform"
+        if: matrix.php-version != '8.0' && matrix.php-version != '8.1'
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: 8.0
 
       - name: "Transform source code"
-        if: matrix.php-version != '7.4' && matrix.php-version != '8.0'
-        run: php bin/transform-source.php
+        if: matrix.php-version != '8.0' && matrix.php-version != '8.1'
+        run: "build/transform-source ${{ matrix.php-version }}"
+
+      - name: "Reinstall matrix PHP version"
+        if: matrix.php-version != '8.0' && matrix.php-version != '8.1'
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
 
       - name: "Lint"
         run: "make lint"
@@ -75,7 +90,7 @@ jobs:
         run: "composer validate"
 
       - name: "Install dependencies"
-        run: "composer install --no-interaction --no-progress --no-suggest"
+        run: "composer install --no-interaction --no-progress"
 
       - name: "Lint"
         run: "make lint"
@@ -105,7 +120,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
 
       - name: "Install dependencies"
-        run: "composer install --no-interaction --no-progress --no-suggest"
+        run: "composer install --no-interaction --no-progress"
 
       - name: "Composer Require Checker"
         run: "make composer-require-checker"

.github/workflows/merge-bot-pr.yml

@@ -0,0 +1,29 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+# https://github.com/WyriHaximus/github-action-wait-for-status
+
+name: Merge bot PR
+on:
+  pull_request:
+    types:
+      - opened
+jobs:
+  automerge:
+    name: Automerge PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Wait for status checks'
+        if: github.event.pull_request.user.login == 'phpstan-bot'
+        id: waitforstatuschecks
+        uses: "WyriHaximus/github-action-wait-for-status@v1"
+        with:
+          ignoreActions: automerge
+          checkInterval: 13
+        env:
+          GITHUB_TOKEN: "${{ secrets.PHPSTAN_BOT_TOKEN }}"
+      - name: Merge Pull Request
+        uses: juliangruber/merge-pull-request-action@v1
+        if: steps.waitforstatuschecks.outputs.status == 'success'
+        with:
+          github-token: "${{ secrets.PHPSTAN_BOT_TOKEN }}"
+          number: "${{ github.event.number }}"
+          method: rebase

.github/workflows/phar.yml

@@ -30,13 +30,10 @@ jobs:
           php-version: "8.0"
 
       - name: "Install dependencies"
-        run: "composer install --no-interaction --no-progress --no-suggest"
+        run: "composer install --no-interaction --no-progress"
 
       - name: "Install compiler dependencies"
-        run: "composer install --no-interaction --no-progress --no-suggest --working-dir=compiler"
-
-      - name: "Transform source code"
-        run: php bin/transform-source.php
+        run: "composer install --no-interaction --no-progress --working-dir=compiler"
 
       - name: "Compile PHAR"
         run: php compiler/bin/compile