Skip to content

Commit cd55d5f

Browse files
dependabot[bot]juliusknorr
authored andcommitted
chore(deps-dev): Bump psalm/phar from 5.26.1 to 6.5.1
Bumps [psalm/phar](https://github.com/psalm/phar) from 5.26.1 to 6.5.1. - [Release notes](https://github.com/psalm/phar/releases) - [Commits](psalm/phar@5.26.1...6.5.1) --- updated-dependencies: - dependency-name: psalm/phar dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent da70f0c commit cd55d5f

6 files changed

Lines changed: 22 additions & 44 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"require-dev": {
2222
"roave/security-advisories": "dev-master",
2323
"jakub-onderka/php-parallel-lint": "^1.0.0",
24-
"psalm/phar": "^5.3",
24+
"psalm/phar": "^6.5",
2525
"friendsofphp/php-cs-fixer": "^3.8",
2626
"nextcloud/coding-standard": "^1.0",
2727
"nextcloud/ocp": "dev-master",

composer.lock

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

lib/Controller/WopiController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ public function putFile(string $fileId, string $access_token): JSONResponse {
555555
return new JSONResponse([], Http::STATUS_NOT_FOUND);
556556
}
557557
$suggested = $this->request->getHeader('X-WOPI-SuggestedTarget');
558-
$suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7');
558+
$suggested = (string)mb_convert_encoding($suggested, 'utf-8', 'utf-7');
559559

560560
if ($suggested[0] === '.') {
561561
$path = dirname($file->getPath()) . '/New File' . $suggested;

lib/TemplateManager.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,10 @@ public function getEmptyFileContent(string $extension): string {
473473
$emptyPath = __DIR__ . '/../emptyTemplates/template.' . $extension;
474474

475475
if (in_array($extension, $supportedExtensions, true) && file_exists($emptyPath)) {
476-
return file_get_contents($emptyPath);
476+
$emptyFileContent = file_get_contents($emptyPath);
477+
if ($emptyFileContent !== false) {
478+
return $emptyFileContent;
479+
}
477480
}
478481

479482
return '';

psalm.xml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
- SPDX-License-Identifier: AGPL-3.0-or-later
55
-->
66
<psalm
7+
errorBaseline="tests/psalm-baseline.xml"
78
errorLevel="4"
9+
findUnusedBaselineEntry="true"
10+
findUnusedCode="false"
11+
phpVersion="8.1"
812
resolveFromConfigFile="true"
913
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1014
xmlns="https://getpsalm.org/schema/config"
1115
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
12-
errorBaseline="tests/psalm-baseline.xml"
13-
phpVersion="8.1"
1416
>
1517
<stubs>
1618
<file name="tests/stub.phpstub" preloadClasses="true"/>
@@ -34,13 +36,6 @@
3436
<referencedMethod name="/Db\\.*::.*/" />
3537
</errorLevel>
3638
</UndefinedMagicMethod>
37-
<UndefinedInterfaceMethod>
38-
<errorLevel type="suppress">
39-
<!-- FIXME Deprecated event handling -->
40-
<referencedMethod name="OCP\IUserManager::listen" />
41-
<referencedMethod name="OCP\IGroupManager::listen" />
42-
</errorLevel>
43-
</UndefinedInterfaceMethod>
4439
<UndefinedClass>
4540
<errorLevel type="suppress">
4641
<referencedClass name="OC\*" />

tests/psalm-baseline.xml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
2+
<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
33
<file src="lib/AppConfig.php">
44
<InvalidArgument>
55
<code><![CDATA[[]]]></code>
@@ -28,11 +28,6 @@
2828
<code><![CDATA[Command]]></code>
2929
</UndefinedClass>
3030
</file>
31-
<file src="lib/Controller/DirectViewController.php">
32-
<InvalidScalarArgument>
33-
<code><![CDATA[$item->getId()]]></code>
34-
</InvalidScalarArgument>
35-
</file>
3631
<file src="lib/Controller/DocumentAPIController.php">
3732
<UndefinedClass>
3833
<code><![CDATA[\OCA\Files\Helper]]></code>
@@ -67,9 +62,6 @@
6762
<NullArgument>
6863
<code><![CDATA[null]]></code>
6964
</NullArgument>
70-
<TypeDoesNotContainType>
71-
<code><![CDATA[$path === '']]></code>
72-
</TypeDoesNotContainType>
7365
<UndefinedInterfaceMethod>
7466
<code><![CDATA[putContent]]></code>
7567
<code><![CDATA[putContent]]></code>
@@ -108,18 +100,6 @@
108100
<code><![CDATA[getToken]]></code>
109101
</UndefinedInterfaceMethod>
110102
</file>
111-
<file src="lib/Template/CollaboraTemplateProvider.php">
112-
<InvalidReturnStatement>
113-
<code><![CDATA[array_map(function (File $file) {
114-
$template = new Template(CollaboraTemplateProvider::class, (string)$file->getId(), $file);
115-
$template->setCustomPreviewUrl($this->urlGenerator->linkToRouteAbsolute('richdocuments.templates.getPreview', ['fileId' => $file->getId()]));
116-
return $template;
117-
}, $collaboraTemplates)]]></code>
118-
</InvalidReturnStatement>
119-
<InvalidReturnType>
120-
<code><![CDATA[array]]></code>
121-
</InvalidReturnType>
122-
</file>
123103
<file src="lib/WOPI/Parser.php">
124104
<RedundantCondition>
125105
<code><![CDATA[$result && count($result) > 0]]></code>

0 commit comments

Comments
 (0)