summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2024-09-30 18:05:05 +0200
committerDaniel Kesselberg <mail@danielkesselberg.de>2024-10-30 15:35:31 +0100
commit79c6cd9e01e91b75f14b51f5f48e4657f71bac83 (patch)
treed938d3415d55a7f77a39577ff7ca0393373dcd9a
parentf0bc87c26174bfcdd40d1ff585fe5ae8dc4ac94b (diff)
downloadnextcloud-server-79c6cd9e01e91b75f14b51f5f48e4657f71bac83.tar.gz
nextcloud-server-79c6cd9e01e91b75f14b51f5f48e4657f71bac83.zip
ci: fail psalm when baseline update required
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
-rw-r--r--.github/workflows/static-code-analysis.yml4
-rw-r--r--build/psalm-baseline.xml3
2 files changed, 2 insertions, 5 deletions
diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index 81496403679..e30e41a4e68 100644
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -36,7 +36,7 @@ jobs:
- name: Show potential changes in Psalm baseline
if: always()
- run: git diff -- . ':!lib/composer'
+ run: git diff --exit-code -- . ':!lib/composer'
- name: Upload Analysis results to GitHub
if: always()
@@ -98,4 +98,4 @@ jobs:
- name: Show potential changes in Psalm baseline
if: always()
- run: git diff -- . ':!lib/composer'
+ run: git diff --exit-code -- . ':!lib/composer'
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index f3f53d02215..ed9aa61c880 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -109,7 +109,6 @@
<file src="apps/dav/lib/CalDAV/CalDavBackend.php">
<InvalidNullableReturnType>
<code>array</code>
- <code>array</code>
</InvalidNullableReturnType>
<LessSpecificReturnStatement>
<code>Reader::read($objectData)</code>
@@ -1424,7 +1423,6 @@
<file src="core/routes.php">
<InvalidScope>
<code>$this</code>
- <code>$this</code>
<code><![CDATA[$this->create('core_ajax_update', '/core/ajax/update.php')]]></code>
</InvalidScope>
</file>
@@ -2103,7 +2101,6 @@
<MoreSpecificReturnType>
<code>\OC\Files\Node\Node</code>
<code>\OC\Files\Node\Node[]</code>
- <code>\OC\Files\Node\Node[]</code>
</MoreSpecificReturnType>
</file>
<file src="lib/private/Files/Node/HookConnector.php">