Merge branch 'phpstan:2.1.x' into Assert-and-throws-are-side-effects

Author: jack-worman

.github/workflows/apiref.yml

@@ -6,15 +6,15 @@ 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.0.x-dev"
+  COMPOSER_ROOT_VERSION: "2.1.x-dev"
 
 concurrency:
   group: apigen-${{ github.ref }} # will be canceled on subsequent pushes in branch

.github/workflows/backward-compatibility.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "2.0.x"
+      - "2.1.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:
-      - "2.0.x"
+      - "2.1.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:
-      - "2.0.x"
+      - "2.1.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:
-      - "2.0.x"
+      - "2.1.x"
     paths:
       - 'compiler/**'
       - '.github/workflows/checksum-phar.yml'
@@ -34,7 +34,7 @@ jobs:
         with:
           repository: phpstan/phpstan
           path: phpstan-dist
-          ref: 2.0.x
+          ref: 2.1.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: "2.0.x-dev"
+          COMPOSER_ROOT_VERSION: "2.1.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: "2.0.x-dev"
+          COMPOSER_ROOT_VERSION: "2.1.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:
-      - "2.0.x"
+      - "2.1.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'

.github/workflows/issue-bot.yml

@@ -11,7 +11,7 @@ on:
       - 'changelog-generator/**'
   push:
     branches:
-      - "2.0.x"
+      - "2.1.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'
@@ -164,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:
-      - "2.0.x"
+      - "2.1.x"
 
 concurrency:
   group: lint-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches

.github/workflows/merge-maintained-branch.yml

@@ -20,5 +20,5 @@ jobs:
         with:
           github_token: "${{ secrets.PHPSTAN_BOT_TOKEN }}"
           source_ref: ${{ github.ref }}
-          target_branch: '2.0.x'
+          target_branch: '2.1.x'
           commit_message_template: 'Merge branch {source_ref} into {target_branch}'

.github/workflows/phar.yml

@@ -6,9 +6,9 @@ on:
   pull_request:
   push:
     branches:
-      - "2.0.x"
+      - "2.1.x"
     tags:
-      - '2.0.*'
+      - '2.1.*'
 
 concurrency:
   group: phar-${{ github.ref }} # will be canceled on subsequent pushes in both branches and pull requests
@@ -77,14 +77,14 @@ jobs:
       - name: "Composer dump"
         run: "composer install --no-interaction --no-progress"
         env:
-          COMPOSER_ROOT_VERSION: "2.0.x-dev"
+          COMPOSER_ROOT_VERSION: "2.1.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: "2.0.x-dev"
+          COMPOSER_ROOT_VERSION: "2.1.x-dev"
 
       - name: "Re-sign PHAR"
         run: "php compiler/build/resign.php tmp/phpstan.phar"
@@ -107,30 +107,30 @@ jobs:
   integration-tests:
     if: github.event_name == 'pull_request'
     needs: compiler-tests
-    uses: phpstan/phpstan/.github/workflows/integration-tests.yml@2.0.x
+    uses: phpstan/phpstan/.github/workflows/integration-tests.yml@2.1.x
     with:
-      ref: 2.0.x
+      ref: 2.1.x
       phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   extension-tests:
     if: github.event_name == 'pull_request'
     needs: compiler-tests
-    uses: phpstan/phpstan/.github/workflows/extension-tests.yml@2.0.x
+    uses: phpstan/phpstan/.github/workflows/extension-tests.yml@2.1.x
     with:
-      ref: 2.0.x
+      ref: 2.1.x
       phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   other-tests:
     if: github.event_name == 'pull_request'
     needs: compiler-tests
-    uses: phpstan/phpstan/.github/workflows/other-tests.yml@2.0.x
+    uses: phpstan/phpstan/.github/workflows/other-tests.yml@2.1.x
     with:
-      ref: 2.0.x
+      ref: 2.1.x
       phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   commit:
     name: "Commit PHAR"
-    if: "github.repository_owner == 'phpstan' && (github.ref == 'refs/heads/2.0.x' || startsWith(github.ref, 'refs/tags/'))"
+    if: "github.repository_owner == 'phpstan' && (github.ref == 'refs/heads/2.1.x' || startsWith(github.ref, 'refs/tags/'))"
     needs: compiler-tests
     runs-on: "ubuntu-latest"
     timeout-minutes: 60
@@ -152,7 +152,7 @@ jobs:
           repository: phpstan/phpstan
           path: phpstan-dist
           token: ${{ secrets.PHPSTAN_BOT_TOKEN }}
-          ref: 2.0.x
+          ref: 2.1.x
 
       - name: "Get previous pushed dist commit"
         id: previous-commit