Skip to content

Merge hotfix 1.2.4 into develop - #66

Merged
turegjorup merged 8 commits into
developfrom
merge/1.2.4-into-develop
Oct 7, 2026
Merged

turegjorup merged 8 commits into
developfrom
merge/1.2.4-into-develop

Conversation

@turegjorup

Copy link
Copy Markdown
Contributor

Merge hotfix 1.2.4 (#64) back into develop.

Changes

  • Merge tag 1.2.4:
    • composer.lock conflict resolved by keeping develop's lock file (API Platform 4.3 etc.) and re-applying the 1.2.4 fix scoped to what composer audit --locked still flags on develop: guzzlehttp/guzzle 7.14.0 → 7.15.5, with its required guzzlehttp/promises 2.5.1 → 2.5.3 and guzzlehttp/psr7 2.12.4 → 2.13.1 (same target versions as 1.2.4). No other lock changes; the other packages updated in 1.2.4 are already at fixed versions on develop.
    • The workflow's composer audit --locked was already on develop.
  • CHANGELOG.md: added the [1.2.4] section above [1.2.3] and updated the footer links ([Unreleased] from 1.2.4, links for 1.2.1–1.2.4).

Why

Gitflow: hotfixes merged to main must be merged back into develop. This also makes the required composer-audit check pass on develop again. Full test suite (265) and PHPStan pass locally; composer audit --locked reports no advisories.

Follows #65 (1.2.3 back-merge). Release 1.3.0 (#62) was cut before both hotfixes, so release/1.3.0 needs them too before it is merged to main.

@turegjorup turegjorup self-assigned this Oct 7, 2026
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 74.42%. Comparing base (4e3dcfc) to head (d8abaee).
⚠️ Report is 13 commits behind head on develop.

Additional details and impacted files
@@              Coverage Diff              @@
##             develop      #66      +/-   ##
=============================================
+ Coverage      72.89%   74.42%   +1.52%     
- Complexity       232      262      +30     
=============================================
  Files             29       30       +1     
  Lines            653      735      +82     
=============================================
+ Hits             476      547      +71     
- Misses           177      188      +11     
Flag Coverage Δ
unittests 74.42% <ø> (+1.52%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@turegjorup
turegjorup merged commit 88c6911 into develop Oct 7, 2026
14 checks passed
@turegjorup
turegjorup deleted the merge/1.2.4-into-develop branch October 7, 2026 08:41
@turegjorup turegjorup mentioned this pull request Oct 7, 2026
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.

2 participants