Skip to content

IBX-11842: Merged branch '4.6' into 5.0 - #821

Open
alongosz wants to merge 4 commits into
5.0from
merge/4.6-to-5.0
Open

IBX-11842: Merged branch '4.6' into 5.0#821
alongosz wants to merge 4 commits into
5.0from
merge/4.6-to-5.0

Conversation

@alongosz

@alongosz alongosz commented Sep 8, 2026

Copy link
Copy Markdown
Member

…ode and lock version (#777)

For more details see https://ibexa.atlassian.net/browse/IBX-11842 and #777

Key changes:

* Fixed `SiteAccessAwareEntityManager::find()` silently dropping the `$lockMode` and `$lockVersion` arguments, causing requested pessimistic/optimistic locks (e.g. `LockMode::PESSIMISTIC_WRITE`) to never be applied.

* Added a scoped PHPStan `ignoreErrors` entry to accommodate `find()`'s wider signature against `ObjectManager::find()`.

* Added unit test coverage verifying lock mode and lock version are forwarded to the wrapped entity manager.

---------

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@alongosz alongosz added the Fast-forward merge PR should be merged in a fast-forward way label Sep 8, 2026
@micszo micszo self-assigned this Sep 10, 2026
For more details see https://ibexa.atlassian.net/browse/IBX-11778 and #818

Key changes:

* Renamed the Backend CI workflow from "CI" to "Backend CI" and added a bare `workflow_dispatch` trigger for manual runs.

* Passed an explicit `php-version` matching the job matrix to all `composer-install` steps in `backend-ci.yaml`.

* Guarded the code style check with `set -euo pipefail` so a `check-cs` failure piped into `cs2pr` is no longer masked.

* Bumped the SHA-pinned `docker/login-action` to v4.6.0 in `gha-docker-solr.yaml`.
@alongosz
alongosz marked this pull request as ready for review September 11, 2026 14:52
@alongosz

Copy link
Copy Markdown
Member Author

@micszo this now contains also #818 merge-up

Pinned the Rector PHP workflow to PHP 8.3 as part of the IBX-11778 GHA
standardization. rector.yaml exists only on 5.0+, so the 4.6 sweep could
not reach it: the caller omitted the php-version input and the shared
workflow fell back to setup-php's latest stable (PHP 8.5), outside the
8.3/8.4 matrix the branch actually tests on. Also named the job, matching
the canonical reference.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@sonarqubecloud

Copy link
Copy Markdown

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 Ready for QA

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants