Skip to content

Commit 5c3871b

Browse files
committed
Merge remote-tracking branch 'origin/1.12.x' into 2.0.x
2 parents 111e474 + a65f7f8 commit 5c3871b

13 files changed

+2
-32
lines changed

.github/workflows/backward-compatibility.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ on:
1111
- 'src/**'
1212
- '.github/workflows/backward-compatibility.yml'
1313

14-
env:
15-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
16-
1714
concurrency:
1815
group: bc-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
1916
cancel-in-progress: true

.github/workflows/build-issue-bot.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ on:
1414
- 'issue-bot/**'
1515
- '.github/workflows/build-issue-bot.yml'
1616

17-
env:
18-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
19-
2017
concurrency:
2118
group: build-issue-bot-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
2219
cancel-in-progress: true

.github/workflows/changelog-generator.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ on:
1414
- 'changelog-generator/**'
1515
- '.github/workflows/changelog-generator.yml'
1616

17-
env:
18-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
19-
2017
concurrency:
2118
group: changelog-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
2219
cancel-in-progress: true

.github/workflows/checksum-phar.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ on:
1717
- 'compiler/**'
1818
- '.github/workflows/checksum-phar.yml'
1919

20-
env:
21-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
22-
2320
concurrency:
2421
group: checksum-phar-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
2522
cancel-in-progress: true

.github/workflows/e2e-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ on:
1818
- 'changelog-generator/**'
1919
- 'issue-bot/**'
2020

21-
env:
22-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
23-
2421
concurrency:
2522
group: e2e-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
2623
cancel-in-progress: true

.github/workflows/issue-bot.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ on:
1717
- 'apigen/**'
1818
- 'changelog-generator/**'
1919

20-
env:
21-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
22-
2320
concurrency:
2421
group: run-issue-bot-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
2522
cancel-in-progress: true

.github/workflows/lint.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ on:
88
branches:
99
- "2.0.x"
1010

11-
env:
12-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
13-
1411
concurrency:
1512
group: lint-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
1613
cancel-in-progress: true

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ on:
1919
- 'issue-bot/**'
2020

2121
env:
22-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
2322
REFLECTION_GOLDEN_TEST_FILE: "/tmp/reflection-golden.test"
2423
REFLECTION_GOLDEN_SYMBOLS_FILE: "/tmp/reflection-golden-symbols.txt"
2524

.github/workflows/static-analysis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ on:
1414
- 'compiler/**'
1515
- 'apigen/**'
1616

17-
env:
18-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
19-
2017
concurrency:
2118
group: sa-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
2219
cancel-in-progress: true

.github/workflows/tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ on:
1818
- 'changelog-generator/**'
1919
- 'issue-bot/**'
2020

21-
env:
22-
COMPOSER_ROOT_VERSION: "2.0.x-dev"
23-
2421
concurrency:
2522
group: tests-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
2623
cancel-in-progress: true

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ Any contributions are welcome.
1717
composer install
1818
```
1919

20-
If you encounter dependency problem, try using `export COMPOSER_ROOT_VERSION=1.11.x-dev`
21-
2220
If you are using macOS and are using an older version of `patch`, you may have problems with patch application failure during `composer install`. Try using `brew install gpatch` to install a newer and supported `patch` version.
2321

2422
### Building

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"symfony/string": "^5.4.3"
4949
},
5050
"replace": {
51-
"phpstan/phpstan": "self.version",
51+
"phpstan/phpstan": "2.0.x",
5252
"symfony/polyfill-php73": "*"
5353
},
5454
"require-dev": {

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)