Merge pull request #1459 from nextcloud/automated/noid/main-update-ne…

…xtcloud-ocp [main] Update nextcloud/ocp dependency
nextcloud · Feb 1, 2025 · 9e113ec · 9e113ec
2 parents da70cd7 + bbcd9e3
commit 9e113ec
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
@@ -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
@@ -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 }}

diff --git 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
 	<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>

diff --git a/composer.lock b/composer.lock
diff --git 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
@@ -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>