Merge pull request #48280 from nextcloud/backport/48266/stable29

nextcloud · Sep 24, 2024 · e3f9798 · e3f9798
2 parents d306a00 + 7bf75b9
commit e3f9798
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 69 deletions.
diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
@@ -64,7 +64,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.yml b/.github/workflows/update-psalm-baseline.yml
diff --git a/psalm.xml b/psalm.xml
@@ -6,7 +6,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.0"
 >