Merge upstream

.editorconfig

@@ -6,7 +6,7 @@ insert_final_newline = true
 charset = utf-8
 trim_trailing_whitespace = true
 
-[*.{php,phpt}]
+[*.{php,phpt,stub}]
 indent_style = tab
 indent_size = 4
 

.github/renovate.json

@@ -0,0 +1,33 @@
+{
+  "extends": [
+    "config:base",
+    "schedule:weekly"
+  ],
+  "rangeStrategy": "update-lockfile",
+  "packageRules": [
+    {
+      "matchPackagePatterns": ["*"],
+      "enabled": false
+    },
+    {
+      "matchPaths": ["+(composer.json)"],
+      "enabled": true,
+      "groupName": "root-composer"
+    },
+    {
+      "matchPaths": ["build-cs/**"],
+      "enabled": true,
+      "groupName": "build-cs"
+    },
+    {
+      "matchPaths": ["compiler/**"],
+      "enabled": true,
+      "groupName": "compiler"
+    },
+    {
+      "matchPaths": [".github/**"],
+      "enabled": true,
+      "groupName": "github-actions"
+    }
+  ]
+}

.github/workflows/backward-compatibility.yml

@@ -6,16 +6,17 @@ on:
   pull_request:
   push:
     branches:
-      - "master"
+      - "**"
 
 env:
-  COMPOSER_ROOT_VERSION: "0.12.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   backward-compatibility:
     name: "Backward Compatibility"
 
     runs-on: "ubuntu-latest"
+    timeout-minutes: 60
 
     steps:
       - name: "Checkout"
@@ -30,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

@@ -6,16 +6,17 @@ on:
   pull_request:
   push:
     branches:
-      - "master"
+      - "**"
 
 env:
-  COMPOSER_ROOT_VERSION: "0.12.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   compiler-tests:
     name: "Compiler Tests"
 
     runs-on: "ubuntu-latest"
+    timeout-minutes: 60
 
     steps:
       - name: "Checkout"
@@ -28,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: |
@@ -44,5 +42,26 @@ 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@1.5.x
+    with:
+      ref: 1.5.x
+
+  extension-tests:
+    if: github.event_name == 'pull_request'
+    needs: compiler-tests
+    uses: phpstan/phpstan/.github/workflows/extension-tests.yml@1.5.x
+    with:
+      ref: 1.5.x
+
+  other-tests:
+    if: github.event_name == 'pull_request'
+    needs: compiler-tests
+    uses: phpstan/phpstan/.github/workflows/other-tests.yml@1.5.x
+    with:
+      ref: 1.5.x

.github/workflows/e2e-tests.yml

@@ -4,24 +4,29 @@ name: "E2E Tests"
 
 on:
   pull_request:
+    paths-ignore:
+      - 'compiler/**'
   push:
     branches:
-      - "master"
+      - "**"
+    paths-ignore:
+      - 'compiler/**'
 
 env:
-  COMPOSER_ROOT_VERSION: "0.12.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   result-cache-e2e-tests:
     name: "Result cache E2E tests"
 
     runs-on: ${{ matrix.operating-system }}
+    timeout-minutes: 60
 
     strategy:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
         operating-system: [ubuntu-latest, windows-latest]
 
     steps:
@@ -37,7 +42,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: |
@@ -46,6 +51,7 @@ jobs:
   e2e-tests:
     name: "E2E tests"
     runs-on: "ubuntu-latest"
+    timeout-minutes: 60
 
     strategy:
       matrix:
@@ -68,12 +74,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

@@ -6,15 +6,16 @@ on:
   pull_request:
   push:
     branches:
-      - "master"
+      - "**"
 
 env:
-  COMPOSER_ROOT_VERSION: "0.12.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   lint:
     name: "Lint"
     runs-on: "ubuntu-latest"
+    timeout-minutes: 60
 
     strategy:
       fail-fast: false
@@ -25,6 +26,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout"
@@ -40,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"
@@ -53,6 +69,7 @@ jobs:
     name: "Coding Standard"
 
     runs-on: "ubuntu-latest"
+    timeout-minutes: 60
 
     strategy:
       matrix:
@@ -73,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"
@@ -85,6 +102,7 @@ jobs:
     name: "Dependency Analysis"
 
     runs-on: "ubuntu-latest"
+    timeout-minutes: 60
 
     strategy:
       matrix:
@@ -102,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