Skip to content

Fix a lot of psalm issues #2628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christianlupus merged 15 commits into from
Mar 5, 2025
Merged

Fix a lot of psalm issues #2628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
be7d3bc
feat(psalm): Enable finding unused baseline entries
provokateurin Jan 12, 2025
11e2250
fix(composer): Use correct OCP version
provokateurin Jan 3, 2025
138fd5c
fix(composer): Add missing ext-dom dependency
provokateurin Jan 3, 2025
03f03c0
fix(psalm): Check against correct PHP version
provokateurin Jan 3, 2025
7425861
fix(RecipeService): Stop unnecessarily checking for methods on File
provokateurin Jan 3, 2025
fcefabb
fix(RecipeService): Catch recipe folder not being a folder
provokateurin Jan 3, 2025
fcce749
fix(ImageService): Add missing exception imports
provokateurin Jan 3, 2025
d15af6a
fix(UserConfigHelper): Explicitly cast value to string
provokateurin Jan 3, 2025
82302a2
fix(RestParameterParser): Handle unsupported content-types
provokateurin Jan 3, 2025
b9b6513
fix(ThumbnailFileHelper): Add missing exception imports
provokateurin Jan 3, 2025
00c839d
fix(HttpMicrodataParser): Use concrete DOMNode sub-types to fix polym…
provokateurin Jan 3, 2025
8441594
fix(SchemaConformityFilter): Fix type coercions for boolean operators
provokateurin Jan 3, 2025
669ad12
fix(FixInstructionsFilter): Prevent accidentally calling array_merge(…
provokateurin Jan 3, 2025
b3af7b1
fix(RecipeDb): Remove unnecessary is_array() check
provokateurin Jan 3, 2025
b544cf5
Update Changelog
christianlupus Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(composer): Use correct OCP version 
Signed-off-by: provokateurin <[email protected]>
  • Loading branch information
@provokateurin @christianlupus
provokateurin authored and christianlupus committed Mar 5, 2025
commit 11e22502f3a8e6a3bd8e11b9c211f21901de8e8d
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"nextcloud/coding-standard": "^1.0.0",
"christophwurst/nextcloud_testing": "^1.0.0",
"psalm/phar": "^5.12",
"nextcloud/ocp": "^27.0"
"nextcloud/ocp": "dev-stable28"
},
"scripts": {
"cs:check": "./vendor/bin/php-cs-fixer fix --dry-run --diff",
Expand All @@ -31,7 +31,7 @@
},
"config": {
"platform": {
"php": "7.4"
"php": "8.0"
}
}
}
26 changes: 14 additions & 12 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

109 changes: 39 additions & 70 deletions tests/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,103 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
<file src="lib/Controller/Implementation/CategoryImplementation.php">
<InvalidArgument>
<code><![CDATA[$e->getMessage()]]></code>
<code><![CDATA['New category name not found in data']]></code>
</InvalidArgument>
</file>
<file src="lib/Controller/Implementation/ConfigImplementation.php">
<InvalidArgument>
<code><![CDATA['OK']]></code>
<code><![CDATA['Search index rebuilt successfully']]></code>
</InvalidArgument>
</file>
<file src="lib/Controller/Implementation/RecipeImplementation.php">
<InvalidArgument>
<code><![CDATA[$e->getMessage()]]></code>
<code><![CDATA[$e->getMessage()]]></code>
<code><![CDATA[$e->getMessage()]]></code>
<code><![CDATA[$e->getMessage()]]></code>
<code><![CDATA[$e->getMessage()]]></code>
<code><![CDATA[$file->getParent()->getId()]]></code>
<code><![CDATA[$file->getParent()->getId()]]></code>
<code>$id</code>
<code><![CDATA['Field "url" is required']]></code>
<code><![CDATA['Recipe ' . $id . ' deleted successfully']]></code>
</InvalidArgument>
<TooManyArguments>
<code><![CDATA[new JSONResponse($recipes, 200, ['Content-Type' => 'application/json'])]]></code>
<code><![CDATA[new JSONResponse($recipes, Http::STATUS_OK, ['Content-Type' => 'application/json'])]]></code>
<code><![CDATA[new JSONResponse($recipes, Http::STATUS_OK, ['Content-Type' => 'application/json'])]]></code>
</TooManyArguments>
</file>
<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
<file src="lib/Db/RecipeDb.php">
<RedundantCondition>
<code><![CDATA[$keywords && is_array($keywords)]]></code>
<code>is_array($keywords)</code>
<code><![CDATA[is_array($keywords)]]></code>
</RedundantCondition>
</file>
<file src="lib/Helper/Filter/JSON/FixInstructionsFilter.php">
<NamedArgumentNotAllowed>
<code>$instructions</code>
<code>$newElements</code>
<code><![CDATA[$instructions]]></code>
<code><![CDATA[$newElements]]></code>
</NamedArgumentNotAllowed>
</file>
<file src="lib/Helper/Filter/JSON/SchemaConformityFilter.php">
<FalseOperand>
<code>$changed</code>
<code><![CDATA[$changed]]></code>
</FalseOperand>
<InvalidOperand>
<code><![CDATA[$this->setJSONValue($json, '@type', 'Recipe')]]></code>
</InvalidOperand>
</file>
<file src="lib/Helper/HTMLParser/HttpMicrodataParser.php">
<UndefinedMethod>
<code>getAttribute</code>
<code>getAttribute</code>
<code>getElementsByTagName</code>
<code>hasAttribute</code>
<code><![CDATA[getAttribute]]></code>
<code><![CDATA[getAttribute]]></code>
<code><![CDATA[getElementsByTagName]]></code>
<code><![CDATA[hasAttribute]]></code>
</UndefinedMethod>
</file>
<file src="lib/Helper/ImageService/ThumbnailFileHelper.php">
<UndefinedDocblockClass>
<code>GenericFileException</code>
<code>GenericFileException</code>
<code>InvalidPathException</code>
<code>InvalidPathException</code>
<code>InvalidThumbnailTypeException</code>
<code>InvalidThumbnailTypeException</code>
<code>LockedException</code>
<code>LockedException</code>
<code><![CDATA[GenericFileException]]></code>
<code><![CDATA[GenericFileException]]></code>
<code><![CDATA[InvalidPathException]]></code>
<code><![CDATA[InvalidPathException]]></code>
<code><![CDATA[InvalidThumbnailTypeException]]></code>
<code><![CDATA[InvalidThumbnailTypeException]]></code>
<code><![CDATA[LockedException]]></code>
<code><![CDATA[LockedException]]></code>
</UndefinedDocblockClass>
</file>
<file src="lib/Helper/RestParameterParser.php">
<InvalidReturnType>
<code>array</code>
<code><![CDATA[array]]></code>
</InvalidReturnType>
</file>
<file src="lib/Helper/UserConfigHelper.php">
<InvalidScalarArgument>
<code>$value</code>
<code><![CDATA[$value]]></code>
</InvalidScalarArgument>
</file>
<file src="lib/Helper/UserFolderHelper.php">
<MissingDependency>
<code><![CDATA[$this->root]]></code>
<code><![CDATA[$this->root]]></code>
<code>IRootFolder</code>
<code>IRootFolder</code>
<code><![CDATA[IRootFolder]]></code>
<code><![CDATA[IRootFolder]]></code>
</MissingDependency>
</file>
<file src="lib/Service/ImageService.php">
<UndefinedDocblockClass>
<code>GenericFileException</code>
<code>InvalidPathException</code>
<code>InvalidThumbnailTypeException</code>
<code>NoRecipeImageFoundException</code>
<code>NoRecipeImageFoundException</code>
<code>NoRecipeImageFoundException</code>
<code>RecipeImageExistsException</code>
<code><![CDATA[GenericFileException]]></code>
<code><![CDATA[InvalidPathException]]></code>
<code><![CDATA[InvalidThumbnailTypeException]]></code>
<code><![CDATA[NoRecipeImageFoundException]]></code>
<code><![CDATA[NoRecipeImageFoundException]]></code>
<code><![CDATA[NoRecipeImageFoundException]]></code>
<code><![CDATA[RecipeImageExistsException]]></code>
</UndefinedDocblockClass>
</file>
<file src="lib/Service/RecipeService.php">
Expand All @@ -106,26 +75,26 @@
<code><![CDATA[$this->root]]></code>
<code><![CDATA[$this->root]]></code>
<code><![CDATA[$this->root]]></code>
<code>IRootFolder</code>
<code><![CDATA[IRootFolder]]></code>
</MissingDependency>
<RedundantCondition>
<code><![CDATA[!array_key_exists('dateCreated', $json) && method_exists($file, 'getCreationTime')]]></code>
</RedundantCondition>
<UndefinedInterfaceMethod>
<code>newFile</code>
<code>newFile</code>
<code>newFile</code>
<code>nodeExists</code>
<code><![CDATA[newFile]]></code>
<code><![CDATA[newFile]]></code>
<code><![CDATA[newFile]]></code>
<code><![CDATA[nodeExists]]></code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/Service/ThumbnailService.php">
<MissingDependency>
<code>$img</code>
<code>$img</code>
<code>$img</code>
<code>$img</code>
<code>$img</code>
<code>Image</code>
<code><![CDATA[$img]]></code>
<code><![CDATA[$img]]></code>
<code><![CDATA[$img]]></code>
<code><![CDATA[$img]]></code>
<code><![CDATA[$img]]></code>
<code><![CDATA[Image]]></code>
</MissingDependency>
</file>
</files>