Merge pull request #48279 from nextcloud/backport/48266/stable30

nextcloud · Sep 24, 2024 · 6fab716 · 6fab716
2 parents 8b56189 + 4800215
commit 6fab716
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 123 deletions.
diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
@@ -66,7 +66,7 @@ jobs:
         run: composer i
 
       - name: Psalm taint analysis
-        run: composer run psalm:ci -- --monochrome --no-progress --output-format=github --report=results.sarif --taint-analysis
+        run: composer run psalm:ci -- --monochrome --no-progress --output-format=github --report=results.sarif --taint-analysis --ignore-baseline
 
       - name: Upload Security Analysis results to GitHub
         if: always()

diff --git a/.github/workflows/update-psalm-baseline-approve-merge.yml b/.github/workflows/update-psalm-baseline-approve-merge.yml
diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml
diff --git a/psalm.xml b/psalm.xml
@@ -10,7 +10,7 @@
 	xmlns="https://getpsalm.org/schema/config"
 	xsi:schemaLocation="https://getpsalm.org/schema/config"
     errorBaseline="build/psalm-baseline.xml"
-	findUnusedBaselineEntry="false"
+	findUnusedBaselineEntry="true"
 	findUnusedCode="false"
 	phpVersion="8.1"
 >