Skip to content

fix: re-apply JSONResponse swap (reverted by #80) + phpcs nit + apexcharts license#90

Merged
rubenvdlinde merged 2 commits intodevelopmentfrom
fix/post-80-rebreakage
May 1, 2026
Merged

fix: re-apply JSONResponse swap (reverted by #80) + phpcs nit + apexcharts license#90
rubenvdlinde merged 2 commits intodevelopmentfrom
fix/post-80-rebreakage

Conversation

@rubenvdlinde
Copy link
Copy Markdown
Contributor

Summary

Clears 3 of the 4 failing checks on PR #87 (release: development → beta).

Failure on #87 Cause Fix
`quality / PHP Quality (phpstan)` (21 errors in DashboardShareApiController) PR #80 (security) was opened from a base before #79 landed; when #80 merged it overwrote my JSONResponse swap with the older DataResponse code Re-apply DataResponse → JSONResponse, same as #79
`quality / PHP Quality (phpcs)` (1 error: AdminTemplateService:328) #79 added `generateUuid()` after `pickFirstMatch()` with two blank lines instead of one Collapse to one blank line
`quality / License (npm)` (apexcharts@5.10.6 `Custom: …apexcharts-logo.png`) license-checker picks up a stray HTTP URL from apexcharts' README. Actual project is MIT-licensed (LICENSE in the apexcharts/apexcharts.js repo). Arrives via @conduction/nextcloud-vue's transitive deps Add to `.license-overrides.json`

The 4th failure — `quality / Vue Quality (eslint)` Nc* import/named errors — stays red. Blocked on nextcloud-vue cutting a release from development (PR #102 merged into ncvue/development, not yet propagated to ncvue/main where semantic-release publishes from). When ncvue ships beta.16+ to npm, mydash's `@conduction/nextcloud-vue: ^0.1.0-beta.1` will pick it up on the next `npm install` and the eslint check will go green automatically.

Verified locally

  • `composer phpstan` → `[OK] No errors` (was 21)
  • `composer phpcs` → clean (was 1)
  • `composer test:unit` → 354/354
  • `.license-overrides.json` is valid JSON

Reviewer note

The DataResponse → JSONResponse swap is identical to what shipped in #79. If we want to prevent another silent revert from a stale-base parallel PR, the right structural fix is to make `DataResponse` go through a typed wrapper (or just always use `JSONResponse` per the existing convention in DashboardApiController + ResponseHelper). Out of scope here.

Three small fixes to clear the failing checks on PR #87 (release
development → beta).

DashboardShareApiController — re-apply the DataResponse →
JSONResponse swap from #79. PR #80 (security) was opened from a
base before #79 landed; when #80 merged, its diff base contained
the old DataResponse code, silently reverting the swap. Brings the
21 phpstan errors in this controller back to zero, same as the
already-merged #79 fix.

AdminTemplateService:328 — collapse a stray double blank line
after pickFirstMatch() into a single blank line. Single phpcs
error introduced by #79's generateUuid() addition (added \n\n
between methods instead of \n).

.license-overrides.json — add apexcharts@5.10.6. license-checker
flags it as `Custom: https://apexcharts.com/media/apexcharts-logo.png`
because it picks up a stray HTTP URL from the package's README;
the actual project is MIT-licensed (LICENSE file in the repo). It
arrives as a transitive dep through @conduction/nextcloud-vue, so
this is a generic fix not tied to any one feature.

NOT included: the eslint Nc* import/named errors. Those are blocked
on nextcloud-vue cutting a release from development (PR #102 merged
into ncvue/development, not yet propagated to ncvue/main where
semantic-release publishes from).

Verified locally:
- composer phpstan → [OK] No errors (was 21)
- composer phpcs   → clean (was 1)
- composer test:unit → 354/354
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 1, 2026

Quality Report — ConductionNL/mydash @ 8af993c

Check PHP Vue Security License Tests
lint
phpcs
phpmd
psalm
phpstan
phpmetrics
eslint
stylelint
composer ✅ 100/100
npm ❌ 1/498 denied
PHPUnit ⏭️
Newman ⏭️
Playwright ⏭️

❌ Denied npm licenses

Package Version License
apexcharts 5.10.6 Custom: https://apexcharts.com/media/apexcharts-logo.png

Quality workflow — 2026-05-01 12:42 UTC

Download the full PDF report from the workflow artifacts.

@rubenvdlinde rubenvdlinde merged commit 3cc821f into development May 1, 2026
23 of 25 checks passed
@rubenvdlinde rubenvdlinde deleted the fix/post-80-rebreakage branch May 1, 2026 12:49
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 1, 2026

Quality Report — ConductionNL/mydash @ 2c623a7

Check PHP Vue Security License Tests
lint
phpcs
phpmd
psalm
phpstan
phpmetrics
eslint
stylelint
composer ✅ 100/100
npm ✅ 498/498
PHPUnit ⏭️
Newman ⏭️
Playwright ⏭️

Quality workflow — 2026-05-01 12:49 UTC

Download the full PDF report from the workflow artifacts.

rubenvdlinde added a commit that referenced this pull request May 3, 2026
fix: re-apply JSONResponse swap (reverted by #80) + phpcs nit + apexcharts license
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.

1 participant