diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
index ef8093bd8..ab51e6c48 100644
--- a/.github/workflows/npm-audit-fix.yml
+++ b/.github/workflows/npm-audit-fix.yml
@@ -14,6 +14,9 @@ on:
# At 2:30 on Sundays
- cron: '30 2 * * 0'
+permissions:
+ contents: read
+
jobs:
build:
runs-on: ubuntu-latest
@@ -21,15 +24,18 @@ jobs:
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
@@ -51,7 +57,7 @@ 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: |
@@ -59,7 +65,7 @@ jobs:
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 }}
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2db24dd6e..2669a920f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -26,7 +26,7 @@ The Notes app is a distraction free notes taking app for [Nextcloud](https://www
https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes.png
-
+
diff --git a/composer.lock b/composer.lock
index 36f6f459b..af2293abf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -840,12 +840,12 @@
"source": {
"type": "git",
"url": "https://github.com/nextcloud-deps/ocp.git",
- "reference": "01c4938b8b704cc5f3d4fa2ab1f5f9f609d8ce03"
+ "reference": "d1399b589aa6c0393b4f62bd7022315a711d8c09"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/01c4938b8b704cc5f3d4fa2ab1f5f9f609d8ce03",
- "reference": "01c4938b8b704cc5f3d4fa2ab1f5f9f609d8ce03",
+ "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/d1399b589aa6c0393b4f62bd7022315a711d8c09",
+ "reference": "d1399b589aa6c0393b4f62bd7022315a711d8c09",
"shasum": ""
},
"require": {
@@ -876,7 +876,7 @@
"issues": "https://github.com/nextcloud-deps/ocp/issues",
"source": "https://github.com/nextcloud-deps/ocp/tree/stable28"
},
- "time": "2024-11-26T00:46:02+00:00"
+ "time": "2025-01-08T00:43:56+00:00"
},
{
"name": "phan/phan",
@@ -2378,8 +2378,8 @@
},
"prefer-stable": true,
"prefer-lowest": false,
- "platform": [],
- "platform-dev": [],
+ "platform": {},
+ "platform-dev": {},
"platform-overrides": {
"php": "8.0"
},
diff --git a/lib/Controller/Helper.php b/lib/Controller/Helper.php
index e75f202c0..065c38b9d 100644
--- a/lib/Controller/Helper.php
+++ b/lib/Controller/Helper.php
@@ -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)
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index d53119624..ba9b0c09c 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -253,6 +253,9 @@
+
+ getData()]]>
+