Skip to content

Merge release 3.14.0 into 4.0.x #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanielBadura merged 5 commits into from
Dec 1, 2025
Merged

Merge release 3.14.0 into 4.0.x #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e0c178
Update dependency pymdown-extensions to v10.17.2
renovate[bot] Nov 26, 2025
6116127
Update shivammathur/setup-php action to v2.36.0 (#792)
renovate[bot] Nov 27, 2025
c0b34b5
Did some housekeeping chores here including:
DanielBadura Nov 28, 2025
c14a953
Merge pull request #794 from patchlevel/housekeeping
DanielBadura Nov 29, 2025
4b84e22
Merge remote-tracking branch 'origin/4.0.x' into 3.14.x-merge-up-into…
DanielBadura Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/backward-compatibility-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"

Expand All @@ -27,7 +27,7 @@ jobs:
fetch-depth: 0

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: none
php-version: "${{ matrix.php-version }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coding-standard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"

Expand All @@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: none
php-version: "${{ matrix.php-version }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deptrac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"

Expand All @@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/docs-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"

Expand All @@ -28,12 +28,11 @@ jobs:
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: none
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1, opcache.enable_cli=1
extensions: pdo_sqlite

- uses: ramsey/composer-install@3.1.1
with:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"
postgres-version:
Expand All @@ -52,7 +52,7 @@ jobs:
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"
mariadb-version:
Expand All @@ -107,7 +107,7 @@ jobs:
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"
mysql-version:
Expand All @@ -162,7 +162,7 @@ jobs:
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
Expand All @@ -187,7 +187,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"

Expand All @@ -196,7 +196,7 @@ jobs:
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mutation-tests-diff.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"

Expand All @@ -27,7 +27,7 @@ jobs:
fetch-depth: 0

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
Expand All @@ -39,4 +39,4 @@ jobs:
dependency-versions: ${{ matrix.dependencies }}

- name: "Infection"
run: "vendor/bin/roave-infection-static-analysis-plugin --threads=max --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --only-covered --min-msi=80 --min-covered-msi=95"
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"
6 changes: 3 additions & 3 deletions .github/workflows/mutation-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"

Expand All @@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
Expand All @@ -41,6 +41,6 @@ jobs:
dependency-versions: ${{ matrix.dependencies }}

- name: "Infection"
run: "vendor/bin/roave-infection-static-analysis-plugin --threads=max"
run: "vendor/bin/infection --threads=max"
env:
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
4 changes: 2 additions & 2 deletions .github/workflows/phpstan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"

Expand All @@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: none
php-version: "${{ matrix.php-version }}"
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/psalm.yml
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions .github/workflows/unit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,24 @@ jobs:
- "8.2"
- "8.3"
- "8.4"
- "8.5"
operating-system:
- "ubuntu-latest"
- "windows-latest"
include:
- dependencies: "locked"
php-version: "8.4"
php-version: "8.5"
operating-system: "ubuntu-latest"
- dependencies: "locked"
php-version: "8.4"
php-version: "8.5"
operating-system: "windows-latest"

steps:
- name: "Checkout"
uses: actions/checkout@v6

- name: "Install PHP"
uses: "shivammathur/setup-php@2.35.5"
uses: "shivammathur/setup-php@2.36.0"
with:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
Expand Down
14 changes: 3 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ phpstan: vendor
phpstan-baseline: vendor ## run phpstan static code analyser
php -d memory_limit=312M vendor/bin/phpstan analyse --generate-baseline

.PHONY: psalm
psalm: vendor ## run psalm static code analyser
php -d memory_limit=312M vendor/bin/psalm

.PHONY: psalm-baseline
psalm-baseline: vendor ## run psalm static code analyser
vendor/bin/psalm --update-baseline --set-baseline=baseline.xml

.PHONY: phpunit
phpunit: vendor phpunit-unit phpunit-integration ## run phpunit tests

Expand All @@ -53,11 +45,11 @@ phpunit-unit: vendor ## run phpu

.PHONY: infection
infection: vendor ## run infection
php -d memory_limit=312M vendor/bin/roave-infection-static-analysis-plugin --threads=max
php -d memory_limit=312M vendor/bin/infection --threads=5

.PHONY: infection-diff
infection-diff: vendor ## run infection on differences
php -d memory_limit=312M vendor/bin/roave-infection-static-analysis-plugin --threads=max --git-diff-lines --git-diff-base=origin/HEAD --ignore-msi-with-no-mutations --only-covered --min-msi=80 --min-covered-msi=95
php -d memory_limit=312M vendor/bin/infection --threads=max --git-diff-lines --git-diff-base=origin/HEAD --ignore-msi-with-no-mutations --only-covered --min-msi=80 --min-covered-msi=95

.PHONY: deptrac
deptrac: vendor-tools ## run deptrac
Expand All @@ -68,7 +60,7 @@ deptrac-baseline: vendor-tools #
cd tools && ./vendor/bin/deptrac -c ../deptrac.yaml --formatter=baseline --output=../deptrac-baseline.yaml

.PHONY: static
static: psalm phpstan cs ## run static analyser
static: phpstan cs ## run static analyser

test: phpunit ## run tests

Expand Down
Loading
Loading