Merge branch '1.9.x' into HEAD

phpstan · Dec 17, 2022 · f02a0a5 · f02a0a5
2 parents 056f13f + 5c71ab2
commit f02a0a5
Show file tree

Hide file tree

Showing 212 changed files with 4,817 additions and 1,495 deletions.
diff --git a/.github/workflows/changelog-generator.yml b/.github/workflows/changelog-generator.yml
@@ -14,6 +14,9 @@ on:
       - 'changelog-generator/**'
       - '.github/workflows/changelog-generator.yml'
 
+env:
+  COMPOSER_ROOT_VERSION: "1.9.x-dev"
+
 concurrency:
   group: changelog-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
   cancel-in-progress: true

diff --git a/.github/workflows/merge-maintained-branch.yml b/.github/workflows/merge-maintained-branch.yml
@@ -15,7 +15,7 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v3
       - name: "Merge branch"
-        uses: everlytic/branch-merge@1.1.4
+        uses: everlytic/branch-merge@1.1.5
         with:
           github_token: "${{ secrets.PHPSTAN_BOT_TOKEN }}"
           source_ref: ${{ github.ref }}

diff --git a/README.md b/README.md
@@ -11,6 +11,14 @@ This repository (`phpstan/phpstan-src`) is for PHPStan's development only. Head
 
 Any contributions are welcome.
 
+### Installation
+
+```bash
+composer install
+```
+
+If you encounter dependency problem, try using `export COMPOSER_ROOT_VERSION=1.9.x-dev`
+
 ### Building
 
 PHPStan's source code is developed on PHP 8.1. For distribution in `phpstan/phpstan` package and as a PHAR file, the source code is transformed to run on PHP 7.2 and higher.

diff --git a/build-cs/composer.lock b/build-cs/composer.lock