Skip to content

Merge hotfix 1.2.5 into develop - #68

Merged
turegjorup merged 5 commits into
developfrom
merge/1.2.5-into-develop
Oct 7, 2026
Merged

turegjorup merged 5 commits into
developfrom
merge/1.2.5-into-develop

Conversation

@turegjorup

Copy link
Copy Markdown
Contributor

Merge hotfix 1.2.5 (#67) back into develop.

Changes

  • Merge tag 1.2.5: app:apikeys:add writes .env.local in place instead of rename(), so it works when .env.local is a single-file bind mount (prod).
  • Conflicts resolved:
    • src/Command/ApiKeysAddCommand.php: took 1.2.5's backup step (no chmod()); the rest of the file keeps develop's Rector changes.
    • tests/Command/ApiKeysAddCommandTest.php: kept develop's $this->assert* style and added 1.2.5's inode assertion.
    • CHANGELOG.md: kept develop's [Unreleased] list, added the [1.2.5] section above [1.2.4] and the footer link ([Unreleased] from 1.2.5).

Why

Gitflow: hotfixes merged to main must be merged back into develop. Full test suite (265), PHPStan, Rector and php-cs-fixer pass locally.

The same branch is merged into release/1.3.0 (#62) so the release carries the fix.

@turegjorup turegjorup mentioned this pull request Oct 7, 2026
@turegjorup
turegjorup merged commit 5d5ff14 into develop Oct 7, 2026
14 checks passed
@turegjorup
turegjorup deleted the merge/1.2.5-into-develop branch October 7, 2026 09:26
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 50.00000% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 74.39%. Comparing base (4e3dcfc) to head (76b8e6f).
⚠️ Report is 28 commits behind head on develop.

Files with missing lines Patch % Lines
src/Command/ApiKeysAddCommand.php 50.00% 4 Missing ⚠️
Additional details and impacted files
@@              Coverage Diff              @@
##             develop      #68      +/-   ##
=============================================
+ Coverage      72.89%   74.39%   +1.49%     
- Complexity       232      264      +32     
=============================================
  Files             29       30       +1     
  Lines            653      738      +85     
=============================================
+ Hits             476      549      +73     
- Misses           177      189      +12     
Flag Coverage Δ
unittests 74.39% <50.00%> (+1.49%) ⬆️

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.

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