Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update nextcloud/ocp dependency #1459

Merged
merged 5 commits into from
Feb 1, 2025
Merged

[main] Update nextcloud/ocp dependency #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce4dfb7
chore(dev-deps): Bump nextcloud/ocp package
nextcloud-command Jan 26, 2025
5f4eb75
fix: add status code param
enjeck Jan 30, 2025
7af51da
build(NC): bump max compatible NC version
enjeck Jan 30, 2025
52124be
fix: update psalm-baseline to suppress Controller errors
enjeck Jan 30, 2025
bbcd9e3
chore(CI): Updating npm-audit-fix.yml workflow from template
nextcloud-bot Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/npm-audit-fix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,28 @@ on:
# At 2:30 on Sundays
- cron: '30 2 * * 0'

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
branches: ['main', 'master', 'stable31', 'stable30', 'stable29']

name: npm-audit-fix-${{ matrix.branches }}

steps:
- name: Checkout
id: checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
ref: ${{ matrix.branches }}
continue-on-error: true

- name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
Expand All @@ -51,15 +57,15 @@ jobs:
uses: nextcloud-libraries/npm-audit-action@2a60bd2e79cc77f2cc4d9a3fe40f1a69896f3a87 # v0.1.0

- name: Run npm ci and npm run build
if: always()
if: steps.checkout.outcome == 'success'
env:
CYPRESS_INSTALL_BINARY: 0
run: |
npm ci
npm run build --if-present

- name: Create Pull Request
if: always()
if: steps.checkout.outcome == 'success'
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The Notes app is a distraction free notes taking app for [Nextcloud](https://www
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes-thumbnail.jpg">https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes.png</screenshot>
<dependencies>
<php min-version="8.0" max-version="8.4"/>
<nextcloud min-version="28" max-version="31"/>
<nextcloud min-version="28" max-version="32"/>
</dependencies>
<repair-steps>
<post-migration>
Expand Down
12 changes: 6 additions & 6 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/Controller/Helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public function logException(\Throwable $e) : void {
$this->logger->error('Controller failed with ' . get_class($e), [ 'exception' => $e ]);
}

/** @param 200|201|400|403|404|423|500|507 $statusCode */
public function createErrorResponse(\Throwable $e, int $statusCode) : JSONResponse {
$response = [
'errorType' => get_class($e)
Expand Down
3 changes: 3 additions & 0 deletions tests/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@
</MissingReturnType>
</file>
<file src="vendor/nextcloud/ocp/OCP/AppFramework/Controller.php">
<ArgumentTypeCoercion>
<code><![CDATA[$data->getData()]]></code>
</ArgumentTypeCoercion>
<MissingClosureParamType>
<code><![CDATA[$data]]></code>
</MissingClosureParamType>
Expand Down