Open 2.0.x-dev

Author: ondrejmirtes

.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'

.github/workflows/e2e-tests.yml

@@ -11,7 +11,7 @@ on:
       - 'issue-bot/**'
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
 
 env:
   COMPOSER_ROOT_VERSION: "1.12.x-dev"

.github/workflows/phar.yml

@@ -6,9 +6,9 @@ on:
   pull_request:
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
     tags:
-      - '1.12.*'
+      - '2.0.*'
 
 concurrency:
   group: phar-${{ github.ref }} # will be canceled on subsequent pushes in both branches and pull requests
@@ -107,25 +107,43 @@ jobs:
   integration-tests:
     if: github.event_name == 'pull_request'
     needs: compiler-tests
+<<<<<<< HEAD
     uses: phpstan/phpstan/.github/workflows/[email protected]
     with:
       ref: 1.12.x
+=======
+    uses: phpstan/phpstan/.github/workflows/[email protected]
+    with:
+      ref: 2.0.x
+>>>>>>> 264ce7a58b (Open 2.0.x-dev)
       phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   extension-tests:
     if: github.event_name == 'pull_request'
     needs: compiler-tests
+<<<<<<< HEAD
     uses: phpstan/phpstan/.github/workflows/[email protected]
     with:
       ref: 1.12.x
+=======
+    uses: phpstan/phpstan/.github/workflows/[email protected]
+    with:
+      ref: 2.0.x
+>>>>>>> 264ce7a58b (Open 2.0.x-dev)
       phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   other-tests:
     if: github.event_name == 'pull_request'
     needs: compiler-tests
+<<<<<<< HEAD
     uses: phpstan/phpstan/.github/workflows/[email protected]
     with:
       ref: 1.12.x
+=======
+    uses: phpstan/phpstan/.github/workflows/[email protected]
+    with:
+      ref: 2.0.x
+>>>>>>> 264ce7a58b (Open 2.0.x-dev)
       phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
 
   commit:
@@ -152,7 +170,11 @@ jobs:
           repository: phpstan/phpstan
           path: phpstan-dist
           token: ${{ secrets.PHPSTAN_BOT_TOKEN }}
+<<<<<<< HEAD
           ref: 1.12.x
+=======
+          ref: 2.0.x
+>>>>>>> 264ce7a58b (Open 2.0.x-dev)
 
       - name: "Get previous pushed dist commit"
         id: previous-commit

.github/workflows/pr-base-on-previous-branch.yml

@@ -19,6 +19,6 @@ jobs:
       - name: Comment PR
         uses: peter-evans/create-or-update-comment@v4
         with:
-          body: "You've opened the pull request against the latest branch 2.0.x. If your code is relevant on 1.12.x and you want it to be released sooner, please rebase your pull request and change its target to 1.12.x."
+          body: "You've opened the pull request against the latest branch 2.0.x. PHPStan 2.0 is not going to be released for months. If your code is relevant on 1.12.x and you want it to be released sooner, please rebase your pull request and change its target to 1.12.x."
           token: ${{ secrets.PHPSTAN_BOT_TOKEN }}
           issue-number: ${{ github.event.pull_request.number }}

.github/workflows/reflection-golden-test.yml

@@ -11,7 +11,7 @@ on:
       - 'issue-bot/**'
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'

.github/workflows/spelling.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.12.x"
+      - "2.0.x"
 
 jobs:
   typos: