Skip to content

IBX-11778: Merged branch '4.6' into 5.0 - #233

Merged
alongosz merged 2 commits into
5.0from
merge/4.6-to-5.0
Aug 19, 2026
Merged

IBX-11778: Merged branch '4.6' into 5.0#233
alongosz merged 2 commits into
5.0from
merge/4.6-to-5.0

Conversation

@alongosz

Copy link
Copy Markdown
Member

Caution

This is a merge pull request

🎫 Issue IBX-11778

Related PRs:

alongosz and others added 2 commits July 16, 2026 15:17
* [GHA] Updated actions/cache to v6

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* [GHA] Updated actions/checkout to v7

Co-Authored-By: Codex <codex@openai.com>

* [GHA][REST integration] Configured explicitly generated GitHub App token

* [GHA][REST integration] Bumped Node version for PHP 7.4 to 20

* [Tests] Fixed incorrect usage of `json_decode`

Co-Authored-By: Codex <codex@openai.com>

* [CI][GHA][REST integration] Passed GitHub App token to setup PHP

Co-Authored-By: Codex <codex@openai.com>

* [GHA][REST integration] Dropped Selenium from functional tests setup

The selenium.yml compose file was only needed because it injects
EZP_TEST_REST_HOST=$WEB_HOST into the app container, pointing the
functional tests at the nginx "web" service instead of the default
localhost. Passing the variable explicitly on docker compose exec
makes the whole Selenium container redundant.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* [Composer] Used branch-alias constraints instead of `@dev` stability flags

`@dev` is only a stability flag: `~4.6.0@dev` still matches any tagged
4.6.* release, so the solver may resolve to old stable versions with
different dependency sets. An explicit `~4.6.x-dev` branch-alias
constraint is more predictable.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* [Composer] Dropped `ibexa/ci-scripts` dev dependency

ibexa/ci-scripts is a standalone project; CI workflows fetch its
scripts directly from GitHub, so the Composer package was unused.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* [GHA][REST integration] Applied Composer audit ignores inside tested package

Audit ignores were only ever configured on the workflow checkout, which
becomes vendor/ibexa/rest solely when this callable runs in ibexa/rest
itself. For external callers (e.g. ibexa/http-cache) the checkout is
the caller's package and vendor/ibexa/rest comes pristine from the 4.6
branch, so its composer update hit Composer 2.10's advisory blocking on
PHP 7.4 (unsolvable twig/guzzle advisories on EOL PHP).

Applying the ignores inside vendor/ibexa/rest covers every caller and
makes the runner-side audit ignores step redundant, hence it's dropped.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Codex <codex@openai.com>
@alongosz alongosz added the Fast-forward merge PR should be merged in a fast-forward way label Aug 18, 2026
@sonarqubecloud

Copy link
Copy Markdown

@alongosz
alongosz merged commit c03bae2 into 5.0 Aug 19, 2026
21 checks passed
@alongosz
alongosz deleted the merge/4.6-to-5.0 branch August 19, 2026 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Fast-forward merge PR should be merged in a fast-forward way

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants