Skip to content

chore: merge 4.4 into main - #2340

Merged
soyuka merged 16 commits into
api-platform:mainfrom
soyuka:chore/merge-4.4-into-main
Sep 13, 2026
Merged

chore: merge 4.4 into main#2340
soyuka merged 16 commits into
api-platform:mainfrom
soyuka:chore/merge-4.4-into-main

Conversation

@soyuka

@soyuka soyuka commented Sep 13, 2026

Copy link
Copy Markdown
Member

Preserve release-branch ancestry before cutting the 5.0 documentation branch.

The merge keeps the 4.4 filter and OpenAPI documentation while preserving main’s newer 5.0-specific wording. The three conflicts in core/doctrine-filters.md, core/filters.md, and core/openapi.md were resolved manually; in particular, the obsolete Symfony withCredentials limitation was replaced by the 4.4 Symfony configuration.

nozarashi20 and others added 16 commits September 12, 2026 15:17
Co-authored-by: Nozarashi <15169250+nozarashi20@users.noreply.github.com>
Co-authored-by: Maxime Valin <bysplashgm@gmail.com>
Co-authored-by: Gourab Sahu <grv_sh@yahoo.co.in>
Co-authored-by: Leighton Thomas <leightonthomas@users.noreply.github.com>
Co-authored-by: cay89 <cay89@users.noreply.github.com>
Record the ancestry discarded when api-platform#2325 was squash-merged, so future merge-ups use the correct merge base.
…platform#2329)

* docs(content-negotiation): document 4.4 charset change

Since 4.4 (core #8226), Content-Type only gets `; charset=utf-8`
for text/* and application/xml; JSON-family media types no longer
carry it. Verified against formatContentType() in
src/State/Util/HttpResponseHeadersTrait.php at upstream/4.4.

* docs(serialization): drop unreachable Symfony <=6.4 branch

Symfony floor is ^7.4 || ^8.0 since core #8397 (verified in
src/Symfony/composer.json at upstream/4.4), so the annotations
branch is unreachable and the >=7.0 branch is unconditional.
Collapse both into a single attributes-only instruction.

* docs(getting-started): state PHP/Symfony version floor

No page stated the supported versions. Add PHP >=8.2 and
Symfony ^7.4 || ^8.0, taken from composer.json and
src/Symfony/composer.json at upstream/4.4.
Core PR #8448 (cd67e0b23) adds the access_decision variable to security
expressions and AccessDecision::getMessage(); document how a voter's
reason reaches the client and that it is gated by kernel.debug. Also add
a usage example for ApiPlatform\Metadata\Exception\AccessDeniedException
(F22), the class the upgrade guide already points to.
Preserve release-branch ancestry before cutting the 5.0
documentation branch.
@soyuka
soyuka merged commit e8df98f into api-platform:main Sep 13, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants