Skip to content

Commit b456ae4

Browse files
Merge pull request #69 from nextcloud/dependabot/composer/psalm/phar-6.5.1
chore(deps-dev): bump psalm/phar from 5.26.1 to 6.5.1
2 parents 32d295d + f2fecef commit b456ae4

File tree

5 files changed

+15
-33
lines changed

5 files changed

+15
-33
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"nextcloud/coding-standard": "^1.0",
1313
"nextcloud/ocp": "dev-stable29",
1414
"phpunit/phpunit": "^9",
15-
"psalm/phar": "^5.26",
15+
"psalm/phar": "^6.5",
1616
"sabre/dav": "^4.1",
1717
"sabre/xml": "^2.2",
1818
"symfony/event-dispatcher": "^5.3.11"

composer.lock

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

lib/Service/AppsService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,6 @@ public function getSpec(string $app): string {
129129
}
130130
}
131131

132-
return json_encode($data);
132+
return json_encode($data, JSON_THROW_ON_ERROR);
133133
}
134134
}

psalm.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
xmlns="https://getpsalm.org/schema/config"
77
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
88
errorBaseline="tests/psalm-baseline.xml"
9+
findUnusedCode="false"
10+
phpVersion="8.0"
911
>
1012
<!--
1113
SPDX-FileCopyrightText: Kate Döen <kate.doeen@nextcloud.com>
@@ -24,13 +26,6 @@
2426
<directory name="vendor/psalm" />
2527
</ignoreFiles>
2628
</extraFiles>
27-
<issueHandlers>
28-
<UndefinedDocblockClass>
29-
<errorLevel type="suppress">
30-
<referencedClass name="OC\AppFramework\OCS\BaseResponse"/>
31-
</errorLevel>
32-
</UndefinedDocblockClass>
33-
</issueHandlers>
3429
<stubs>
3530
<file name="tests/stubs/oc_security_csp_contentsecuritypolicynoncemanager.php" />
3631
</stubs>

tests/psalm-baseline.xml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,2 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.x-dev@">
3-
<file src="lib/Controller/PageController.php">
4-
<UndefinedClass occurrences="3">
5-
<code>$this-&gt;themesService</code>
6-
<code>ThemesService</code>
7-
<code>ThemesService</code>
8-
</UndefinedClass>
9-
</file>
10-
<file src="lib/Service/AppsService.php">
11-
<UndefinedClass occurrences="1">
12-
<code>OC</code>
13-
</UndefinedClass>
14-
</file>
15-
</files>
2+
<files psalm-version="6.5.1@3f17a6b24a2dbe543e21408c2b19108cf6a355ef"/>

0 commit comments

Comments
 (0)