Skip to content

IBX-12358,IBX-12530: Merged branch '4.6' into 5.0 - #147

Open
Steveb-p wants to merge 5 commits into
5.0from
merge/4.6-to-5.0
Open

IBX-12358,IBX-12530: Merged branch '4.6' into 5.0#147
Steveb-p wants to merge 5 commits into
5.0from
merge/4.6-to-5.0

Conversation

@Steveb-p

@Steveb-p Steveb-p commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

Caution

This is a merge pull request

🎫 Issue IBX-12358,IBX-12530

Related PRs:

Steveb-p and others added 4 commits August 31, 2026 14:07
# Conflicts:
#	composer.json
#	tests/integration/IbexaTestKernel.php
Points CI at test-core's own 4.6-to-5.0 merge-up, which carries the DatabaseSchemaHook
change this merge-up depends on. Must be removed once that lands.
@Steveb-p Steveb-p added the Fast-forward merge PR should be merged in a fast-forward way label Sep 10, 2026
@Steveb-p

Copy link
Copy Markdown
Contributor Author

Conflict resolution notecomposer.json.

Resolved by keeping 5.0's own tier pins and pulling in only the genuinely new dependency: ibexa/test-core, added by IBX-12358 on 4.6 and absent from 5.0's require-dev, translated to ~5.0.x-dev.

The other three keys 4.6 has that 5.0 lacks — ibexa/ci-scripts, friendsofphp/php-cs-fixer, symfony/proxy-manager-bridge — are pre-existing 4.6-only entries that 5.0 dropped deliberately, so they were not reintroduced.

@Steveb-p

Copy link
Copy Markdown
Contributor Author

The failing User login providers tests / browser-tests check is an artifact of the temporary dependencies.json commit, not of the merge itself.

Evidence:

  1. Comparing the full package sets installed by this PR's browser-test job against a currently-passing 5.0 PR (IBX-10894: Moved throw error when invitation not found in database to gateway #136), the only difference is one added package: ibexa/test-core (dev-merge/4.6-to-5.0). Every other package resolves to an identical version.
  2. Upstream drift is ruled out — I re-ran IBX-10894: Moved throw error when invitation not found in database to gateway #136's browser job today and it still passes, so nothing that moved on 5.0 in the meantime is responsible.
  3. This merge-up's own content cannot reach the browser suite: the diff is four files, all of them composer.json (one require-dev line), dependencies.json, tests/bootstrap.php and tests/integration/IbexaTestKernel.php. The features/browser/ tree is untouched.

The mechanism is that dependencies.json force-installs ibexa/test-core into the application the browser tests build. As an ibexa-bundle, it then gets registered app-wide rather than staying a test-only dependency, which perturbs this suite specifically. Six sibling merge-ups carrying the identical pin pass their browser tests, because their suites don't exercise the affected area.

This clears itself: the pin exists only until ibexa/test-core#48 lands, and must be removed before merging — at which point this check should go green. I'll re-run it as part of dropping the temporary commit.

@Steveb-p
Steveb-p marked this pull request as ready for review September 11, 2026 07:44
ibexa/test-core#48 has been merged into 5.0, so the pin to its merge-up branch is no
longer needed - and that branch has been deleted, which would break composer install.
@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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants