Skip to content

Commit 9e113ec

Browse files
authored
Merge pull request #1459 from nextcloud/automated/noid/main-update-nextcloud-ocp
[main] Update nextcloud/ocp dependency
2 parents da70cd7 + bbcd9e3 commit 9e113ec

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

.github/workflows/npm-audit-fix.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,28 @@ on:
1414
# At 2:30 on Sundays
1515
- cron: '30 2 * * 0'
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
build:
1922
runs-on: ubuntu-latest
2023

2124
strategy:
2225
fail-fast: false
2326
matrix:
24-
branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
27+
branches: ['main', 'master', 'stable31', 'stable30', 'stable29']
2528

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

2831
steps:
2932
- name: Checkout
33+
id: checkout
3034
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3135
with:
36+
persist-credentials: false
3237
ref: ${{ matrix.branches }}
38+
continue-on-error: true
3339

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

5359
- name: Run npm ci and npm run build
54-
if: always()
60+
if: steps.checkout.outcome == 'success'
5561
env:
5662
CYPRESS_INSTALL_BINARY: 0
5763
run: |
5864
npm ci
5965
npm run build --if-present
6066
6167
- name: Create Pull Request
62-
if: always()
68+
if: steps.checkout.outcome == 'success'
6369
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
6470
with:
6571
token: ${{ secrets.COMMAND_BOT_PAT }}

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The Notes app is a distraction free notes taking app for [Nextcloud](https://www
2626
<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>
2727
<dependencies>
2828
<php min-version="8.0" max-version="8.4"/>
29-
<nextcloud min-version="28" max-version="31"/>
29+
<nextcloud min-version="28" max-version="32"/>
3030
</dependencies>
3131
<repair-steps>
3232
<post-migration>

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Controller/Helper.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public function logException(\Throwable $e) : void {
133133
$this->logger->error('Controller failed with ' . get_class($e), [ 'exception' => $e ]);
134134
}
135135

136+
/** @param 200|201|400|403|404|423|500|507 $statusCode */
136137
public function createErrorResponse(\Throwable $e, int $statusCode) : JSONResponse {
137138
$response = [
138139
'errorType' => get_class($e)

tests/psalm-baseline.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,9 @@
253253
</MissingReturnType>
254254
</file>
255255
<file src="vendor/nextcloud/ocp/OCP/AppFramework/Controller.php">
256+
<ArgumentTypeCoercion>
257+
<code><![CDATA[$data->getData()]]></code>
258+
</ArgumentTypeCoercion>
256259
<MissingClosureParamType>
257260
<code><![CDATA[$data]]></code>
258261
</MissingClosureParamType>

0 commit comments

Comments
 (0)