Skip to content
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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions .github/workflows/static-code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,29 @@ jobs:
- name: Show potential changes in Psalm baseline
if: always()
run: git diff --exit-code -- . ':!lib/composer'

static-code-analysis-ncu:
runs-on: ubuntu-latest

if: ${{ github.event_name != 'push' && github.repository_owner != 'nextcloud-gmbh' }}

steps:
- name: Checkout
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
with:
submodules: true

- name: Set up php
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
with:
php-version: '8.1'
extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
coverage: none
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Composer install
run: composer i

- name: Psalm
run: composer run psalm:ncu -- --threads=1 --monochrome --no-progress --output-format=github
1 change: 1 addition & 0 deletions build/files-checker.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
'ocs-provider',
'package-lock.json',
'package.json',
'psalm-ncu.xml',
'psalm-ocp.xml',
'psalm.xml',
'public.php',
Expand Down
122 changes: 122 additions & 0 deletions build/psalm/NcuExperimentalChecker.php
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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing check for since

Copy link
Member Author

@provokateurin provokateurin Nov 12, 2024

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.

Copy link
Member

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

An API can only live in this unstable namespace for one major release.

Deprecated API from the NCU namespace are kept for 2 major releases.

Copy link
Member Author

@provokateurin provokateurin Nov 12, 2024

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).

Copy link
Member

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

$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)
)
);
}
}
}
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/stubs/*' -print0 | xargs -0 -n1 php -l",
"psalm": "psalm --no-cache --threads=$(nproc)",
"psalm:ocp": "psalm --no-cache --threads=$(nproc) -c psalm-ocp.xml",
"psalm:ncu": "psalm --no-cache --threads=$(nproc) -c psalm-ncu.xml",
"psalm:security": "psalm --no-cache --threads=$(nproc) --taint-analysis --use-baseline=build/psalm-baseline-security.xml",
"psalm:update-baseline": "psalm --no-cache --threads=$(nproc) --update-baseline",
"serve": [
Expand Down
21 changes: 21 additions & 0 deletions psalm-ncu.xml
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>
1 change: 0 additions & 1 deletion psalm-ocp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
</plugins>
<projectFiles>
<directory name="lib/public"/>
<directory name="lib/unstable"/>
<ignoreFiles>
<directory name="lib/composer/bin"/>
</ignoreFiles>
Expand Down
Loading