Skip to content

Commit 1066e35

Browse files
DanielBaduraDanielBadura
authored
Merge pull request #133 from patchlevel/1.13.x-merge-up-into-2.0.x_BVhYvWnC
Merge release 1.13.0 into 2.0.x
2 parents 5c4e315 + 3b96b86 commit 1066e35

27 files changed

+889
-2873
lines changed

‎.github/workflows/backward-compatibility-check.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,21 @@ jobs:
1616
dependencies:
1717
- "locked"
1818
php-version:
19-
- "8.4"
19+
- "8.5"
2020
operating-system:
2121
- "ubuntu-latest"
2222

2323
steps:
2424
- name: "Checkout"
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626
with:
2727
fetch-depth: 0
2828

2929
- name: "Install PHP"
30-
uses: "shivammathur/setup-php@2.35.5"
30+
uses: "shivammathur/setup-php@2.36.0"
3131
with:
32-
coverage: "pcov"
3332
php-version: "${{ matrix.php-version }}"
3433
ini-values: memory_limit=-1
35-
extensions: pdo_sqlite, bcmath, intl, sodium
3634

3735
- uses: ramsey/composer-install@3.1.1
3836
with:

‎.github/workflows/benchmark.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@ jobs:
2222

2323
steps:
2424
- name: "Install PHP"
25-
uses: "shivammathur/setup-php@2.35.5"
25+
uses: "shivammathur/setup-php@2.36.0"
2626
with:
2727
coverage: "none"
2828
php-version: "${{ matrix.php-version }}"
2929
ini-values: memory_limit=-1, opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M
30-
extensions: pdo_sqlite
3130

3231
- name: "Checkout base"
33-
uses: actions/checkout@v5
32+
uses: actions/checkout@v6
3433
with:
3534
ref: ${{ github.base_ref }}
3635

@@ -42,7 +41,7 @@ jobs:
4241
run: "vendor/bin/phpbench run tests/Benchmark --progress=none --report=default --tag=base"
4342

4443
- name: "Checkout"
45-
uses: actions/checkout@v5
44+
uses: actions/checkout@v6
4645
with:
4746
clean: false
4847

‎.github/workflows/coding-standard.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ jobs:
2626

2727
steps:
2828
- name: "Checkout"
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030

3131
- name: "Install PHP"
32-
uses: "shivammathur/setup-php@2.35.5"
32+
uses: "shivammathur/setup-php@2.36.0"
3333
with:
34-
coverage: "pcov"
3534
php-version: "${{ matrix.php-version }}"
3635
ini-values: memory_limit=-1
37-
extensions: pdo_sqlite
3836

3937
- uses: ramsey/composer-install@3.1.1
4038
with:

‎.github/workflows/mutation-tests-diff.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,20 @@ jobs:
2222

2323
steps:
2424
- name: "Checkout"
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626
with:
2727
fetch-depth: 0
2828

2929
- name: "Install PHP"
30-
uses: "shivammathur/setup-php@2.35.5"
30+
uses: "shivammathur/setup-php@2.36.0"
3131
with:
3232
coverage: "pcov"
3333
php-version: "${{ matrix.php-version }}"
3434
ini-values: memory_limit=-1
35-
extensions: pdo_sqlite
3635

3736
- uses: ramsey/composer-install@3.1.1
3837
with:
3938
dependency-versions: ${{ matrix.dependencies }}
4039

4140
- name: "Infection"
42-
run: "vendor/bin/infection --threads=max --static-analysis-tool=phpstan --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --with-uncovered --min-msi=90 --min-covered-msi=95"
41+
run: "vendor/bin/infection --threads=max --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --with-uncovered --min-msi=90 --min-covered-msi=95"

‎.github/workflows/mutation-tests.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,20 @@ jobs:
2626

2727
steps:
2828
- name: "Checkout"
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030

3131
- name: "Install PHP"
32-
uses: "shivammathur/setup-php@2.35.5"
32+
uses: "shivammathur/setup-php@2.36.0"
3333
with:
3434
coverage: "pcov"
3535
php-version: "${{ matrix.php-version }}"
3636
ini-values: memory_limit=-1
37-
extensions: pdo_sqlite
3837

3938
- uses: ramsey/composer-install@3.1.1
4039
with:
4140
dependency-versions: ${{ matrix.dependencies }}
4241

4342
- name: "Infection"
44-
run: "vendor/bin/infection --threads=max --static-analysis-tool=phpstan"
43+
run: "vendor/bin/infection --threads=max"
4544
env:
4645
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

‎.github/workflows/phpstan.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ jobs:
2626

2727
steps:
2828
- name: "Checkout"
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030

3131
- name: "Install PHP"
32-
uses: "shivammathur/setup-php@2.35.5"
32+
uses: "shivammathur/setup-php@2.36.0"
3333
with:
34-
coverage: "pcov"
3534
php-version: "${{ matrix.php-version }}"
3635
ini-values: memory_limit=-1
37-
extensions: pdo_sqlite
3836

3937
- uses: ramsey/composer-install@3.1.1
4038
with:

‎.github/workflows/psalm.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎.github/workflows/release-on-milestone-closed-triggering-release-event.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: "Checkout"
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222

2323
- name: "Release"
2424
uses: "laminas/automatic-releases@v1"

‎.github/workflows/unit.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,14 @@ jobs:
4343
composer-options: "--ignore-platform-reqs"
4444
steps:
4545
- name: "Checkout"
46-
uses: actions/checkout@v5
46+
uses: actions/checkout@v6
4747

4848
- name: "Install PHP"
49-
uses: "shivammathur/setup-php@2.35.5"
49+
uses: "shivammathur/setup-php@2.36.0"
5050
with:
5151
coverage: "pcov"
5252
php-version: "${{ matrix.php-version }}"
5353
ini-values: memory_limit=-1
54-
extensions: pdo_sqlite
5554

5655
- uses: ramsey/composer-install@3.1.1
5756
with:

‎Makefile‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,22 @@ cs: vendor
1515

1616
.PHONY: phpstan
1717
phpstan: vendor ## run phpstan static code analyser
18-
vendor/bin/phpstan analyse
18+
vendor/bin/phpstan analyse --memory-limit=-1
1919

2020
.PHONY: phpstan-baseline
2121
phpstan-baseline: vendor ## run phpstan static code analyser
22-
vendor/bin/phpstan analyse --generate-baseline
23-
24-
.PHONY: psalm
25-
psalm: vendor ## run psalm static code analyser
26-
vendor/bin/psalm
27-
28-
.PHONY: psalm-baseline
29-
psalm-baseline: vendor ## run psalm static code analyser
30-
vendor/bin/psalm --update-baseline --set-baseline=baseline.xml
22+
vendor/bin/phpstan analyse --generate-baseline --memory-limit=-1
3123

3224
.PHONY: phpunit
3325
phpunit: vendor ## run phpunit tests
3426
XDEBUG_MODE=coverage vendor/bin/phpunit
3527

3628
.PHONY: infection
3729
infection: vendor ## run infection
38-
XDEBUG_MODE=coverage vendor/bin/roave-infection-static-analysis-plugin --threads=max
30+
XDEBUG_MODE=coverage vendor/bin/infection --threads=3
3931

4032
.PHONY: static
41-
static: psalm phpstan phpcs-check ## run static analyser
33+
static: phpstan cs ## run static analysers
4234

4335
test: phpunit ## run tests
4436

0 commit comments

Comments
 (0)