-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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.
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
build(psalm): Configure unstable namespace #49224
Open
provokateurin
wants to merge
1
commit into
master
Choose a base branch
from
build/psalm/unstable-namespace
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+171
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
/** | ||
* SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors | ||
* SPDX-License-Identifier: AGPL-3.0-only | ||
*/ | ||
|
||
use PhpParser\Node\Stmt; | ||
use PhpParser\Node\Stmt\ClassLike; | ||
use Psalm\CodeLocation; | ||
use Psalm\DocComment; | ||
use Psalm\Exception\DocblockParseException; | ||
use Psalm\FileSource; | ||
use Psalm\Issue\InvalidDocblock; | ||
use Psalm\IssueBuffer; | ||
use Psalm\Plugin\EventHandler\Event\AfterClassLikeVisitEvent; | ||
|
||
class NcuExperimentalChecker implements Psalm\Plugin\EventHandler\AfterClassLikeVisitInterface { | ||
public static function afterClassLikeVisit(AfterClassLikeVisitEvent $event): void { | ||
$stmt = $event->getStmt(); | ||
$statementsSource = $event->getStatementsSource(); | ||
|
||
self::checkClassComment($stmt, $statementsSource); | ||
|
||
foreach ($stmt->getMethods() as $method) { | ||
self::checkMethodOrConstantComment($method, $statementsSource, 'method'); | ||
} | ||
|
||
foreach ($stmt->getConstants() as $constant) { | ||
self::checkMethodOrConstantComment($constant, $statementsSource, 'constant'); | ||
} | ||
} | ||
|
||
private static function checkClassComment(ClassLike $stmt, FileSource $statementsSource): void { | ||
$docblock = $stmt->getDocComment(); | ||
|
||
if ($docblock === null) { | ||
IssueBuffer::maybeAdd( | ||
new InvalidDocblock( | ||
'PHPDoc is required for classes/interfaces in NCU.', | ||
new CodeLocation($statementsSource, $stmt) | ||
) | ||
); | ||
return; | ||
} | ||
|
||
try { | ||
$parsedDocblock = DocComment::parsePreservingLength($docblock); | ||
} catch (DocblockParseException $e) { | ||
IssueBuffer::maybeAdd( | ||
new InvalidDocblock( | ||
$e->getMessage(), | ||
new CodeLocation($statementsSource, $stmt) | ||
) | ||
); | ||
return; | ||
} | ||
|
||
if (!isset($parsedDocblock->tags['experimental'])) { | ||
IssueBuffer::maybeAdd( | ||
new InvalidDocblock( | ||
'@experimental is required for classes/interfaces in NCU.', | ||
new CodeLocation($statementsSource, $stmt) | ||
) | ||
); | ||
} | ||
|
||
if (isset($parsedDocblock->tags['depreacted'])) { | ||
IssueBuffer::maybeAdd( | ||
new InvalidDocblock( | ||
'Typo in @deprecated for classes/interfaces in NCU.', | ||
new CodeLocation($statementsSource, $stmt) | ||
) | ||
); | ||
} | ||
} | ||
|
||
private static function checkMethodOrConstantComment(Stmt $stmt, FileSource $statementsSource, string $type): void { | ||
$docblock = $stmt->getDocComment(); | ||
|
||
if ($docblock === null) { | ||
IssueBuffer::maybeAdd( | ||
new InvalidDocblock( | ||
'PHPDoc is required for ' . $type . 's in NCU.', | ||
new CodeLocation($statementsSource, $stmt) | ||
), | ||
); | ||
return; | ||
} | ||
|
||
try { | ||
$parsedDocblock = DocComment::parsePreservingLength($docblock); | ||
} catch (DocblockParseException $e) { | ||
IssueBuffer::maybeAdd( | ||
new InvalidDocblock( | ||
$e->getMessage(), | ||
new CodeLocation($statementsSource, $stmt) | ||
) | ||
); | ||
return; | ||
} | ||
|
||
if (!isset($parsedDocblock->tags['experimental'])) { | ||
IssueBuffer::maybeAdd( | ||
new InvalidDocblock( | ||
'@experimental is required for ' . $type . 's in NCU.', | ||
new CodeLocation($statementsSource, $stmt) | ||
) | ||
); | ||
} | ||
|
||
if (isset($parsedDocblock->tags['depreacted'])) { | ||
IssueBuffer::maybeAdd( | ||
new InvalidDocblock( | ||
'Typo in @deprecated for ' . $type . ' in NCU.', | ||
new CodeLocation($statementsSource, $stmt) | ||
) | ||
); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<?xml version="1.0"?> | ||
<!-- | ||
- SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
- SPDX-License-Identifier: AGPL-3.0-or-later | ||
--> | ||
<psalm | ||
errorLevel="1" | ||
resolveFromConfigFile="true" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns="https://getpsalm.org/schema/config" | ||
xsi:schemaLocation="https://getpsalm.org/schema/config" | ||
findUnusedBaselineEntry="false" | ||
findUnusedCode="false" | ||
> | ||
<plugins> | ||
<plugin filename="build/psalm/NcuExperimentalChecker.php"/> | ||
</plugins> | ||
<projectFiles> | ||
<directory name="lib/unstable"/> | ||
</projectFiles> | ||
</psalm> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing check for since
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For NCU we only want to check
@experimental
and not@since
.If the API is moved to OCP it is not compatible anyway due to the namespace change (even if everything else stays the same), so that's the point when the
@since
annotations need to be added and the@experimental
annotations need to be removed.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need the since to be able to remember the 1 release until decision and 2 releases until removal?
https://docs.nextcloud.com/server/latest/developer_manual/digging_deeper/api.html
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought we'd add
@experimental 31.0.0
to indicate the version it lives in the namespace.@ArtificialOwl maybe you can shed some more light on how this should work, the documentation doesn't seem to be clear enough about this (please also update it if necessary).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As you are saying, having
@since
while in unstable might be confusing, and we can follow the implementation version via@experimental