Skip to content

Commit 85ba4e0

Browse files
provokateurinprovokateurin
authored
Merge pull request #56522 from nextcloud/feat/strict-php-checks
2 parents 128f56c + 8713730 commit 85ba4e0

File tree

8 files changed

+230
-82
lines changed

8 files changed

+230
-82
lines changed

‎.github/workflows/rector.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
2+
# SPDX-License-Identifier: AGPL-3.0-or-later
3+
name: Rector
4+
5+
on:
6+
pull_request:
7+
8+
permissions:
9+
contents: read
10+
11+
concurrency:
12+
group: rector-${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
strict:
17+
runs-on: ubuntu-latest
18+
19+
if: ${{ github.event_name != 'push' && github.repository_owner != 'nextcloud-gmbh' }}
20+
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
24+
with:
25+
persist-credentials: false
26+
submodules: true
27+
28+
- name: Set up php
29+
uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
30+
with:
31+
php-version: '8.2'
32+
extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,imagick,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
33+
coverage: none
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
37+
- name: Composer install
38+
run: composer i
39+
40+
- name: Rector
41+
run: composer run rector:strict
42+
43+
- name: Show changes
44+
if: always()
45+
run: git diff --exit-code -- . ':!lib/composer'

‎.github/workflows/static-code-analysis.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,30 @@ jobs:
149149

150150
- name: Psalm
151151
run: composer run psalm:ncu -- --threads=1 --monochrome --no-progress --output-format=github
152+
153+
static-code-analysis-strict:
154+
runs-on: ubuntu-latest
155+
156+
if: ${{ github.event_name != 'push' && github.repository_owner != 'nextcloud-gmbh' }}
157+
158+
steps:
159+
- name: Checkout
160+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
161+
with:
162+
persist-credentials: false
163+
submodules: true
164+
165+
- name: Set up php
166+
uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 #v2.35.4
167+
with:
168+
php-version: '8.2'
169+
extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
170+
coverage: none
171+
env:
172+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
173+
174+
- name: Composer install
175+
run: composer i
176+
177+
- name: Psalm
178+
run: composer run psalm:strict -- --threads=1 --monochrome --no-progress --output-format=github

‎build/files-checker.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
'package.json',
7575
'psalm-ncu.xml',
7676
'psalm-ocp.xml',
77+
'psalm-strict.xml',
7778
'psalm.xml',
7879
'public.php',
7980
'remote.php',

‎build/rector-shared.php‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
7+
* SPDX-License-Identifier: AGPL-3.0-only
8+
*/
9+
10+
use Nextcloud\Rector\Set\NextcloudSets;
11+
use PhpParser\Node;
12+
use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
13+
use Rector\Config\RectorConfig;
14+
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
15+
use Rector\PHPUnit\Set\PHPUnitSetList;
16+
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
17+
use Rector\ValueObject\Application\File;
18+
19+
$nextcloudDir = dirname(__DIR__);
20+
21+
class NextcloudNamespaceSkipVoter implements ClassNameImportSkipVoterInterface {
22+
private array $namespacePrefixes = [
23+
'OC',
24+
'OCA',
25+
'OCP',
26+
];
27+
private array $skippedClassNames = [
28+
'Backend',
29+
'Connection',
30+
'Exception',
31+
'IManager',
32+
'IProvider',
33+
'Manager',
34+
'Plugin',
35+
'Provider',
36+
];
37+
public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node) : bool {
38+
if (in_array($fullyQualifiedObjectType->getShortName(), $this->skippedClassNames)) {
39+
// Skip common class names to avoid confusion
40+
return true;
41+
}
42+
foreach ($this->namespacePrefixes as $prefix) {
43+
if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix . '\\')) {
44+
// Import Nextcloud namespaces
45+
return false;
46+
}
47+
}
48+
// Skip everything else
49+
return true;
50+
}
51+
}
52+
53+
$config = RectorConfig::configure()
54+
->withSkip([
55+
$nextcloudDir . '/apps/*/3rdparty/*',
56+
$nextcloudDir . '/apps/*/build/stubs/*',
57+
$nextcloudDir . '/apps/*/composer/*',
58+
$nextcloudDir . '/apps/*/config/*',
59+
// The mock classes are excluded, as the tests explicitly test the annotations which should not be migrated to attributes
60+
$nextcloudDir . '/tests/lib/AppFramework/Middleware/Mock/*',
61+
$nextcloudDir . '/tests/lib/AppFramework/Middleware/Security/Mock/*',
62+
])
63+
// uncomment to reach your current PHP version
64+
// ->withPhpSets()
65+
->withImportNames(importShortClasses:false)
66+
->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
67+
'inline_public' => true,
68+
'rename_property' => true,
69+
])
70+
->withSets([
71+
NextcloudSets::NEXTCLOUD_27,
72+
PHPUnitSetList::PHPUNIT_100,
73+
]);
74+
75+
$config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
76+
77+
/* Ignore all files ignored by git */
78+
$ignoredEntries = shell_exec('git status --porcelain --ignored ' . escapeshellarg($nextcloudDir));
79+
$ignoredEntries = explode("\n", $ignoredEntries);
80+
$ignoredEntries = array_filter($ignoredEntries, static fn (string $line) => str_starts_with($line, '!! '));
81+
$ignoredEntries = array_map(static fn (string $line) => substr($line, 3), $ignoredEntries);
82+
$ignoredEntries = array_values($ignoredEntries);
83+
84+
foreach ($ignoredEntries as $ignoredEntry) {
85+
if (str_ends_with($ignoredEntry, '/')) {
86+
$config->withSkip([$ignoredEntry . '*']);
87+
} else {
88+
$config->withSkip([$ignoredEntry . '/*']);
89+
}
90+
}
91+
92+
return $config;

‎build/rector-strict.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
/**
4+
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
5+
* SPDX-License-Identifier: AGPL-3.0-or-later
6+
*/
7+
8+
$nextcloudDir = dirname(__DIR__);
9+
10+
return (require __DIR__ . '/rector-shared.php')
11+
->withPaths([
12+
$nextcloudDir . '/build/rector-strict.php',
13+
// TODO: Add more files. The entry above is just there to stop rector from complaining about the fact that it ran without checking any files.
14+
])
15+
->withPreparedSets(
16+
deadCode: true,
17+
codeQuality: true,
18+
codingStyle: true,
19+
typeDeclarations: true,
20+
typeDeclarationDocblocks: true,
21+
privatization: true,
22+
instanceOf: true,
23+
earlyReturn: true,
24+
rectorPreset: true,
25+
phpunitCodeQuality: true,
26+
doctrineCodeQuality: true,
27+
symfonyCodeQuality: true,
28+
symfonyConfigs: true,
29+
)->withPhpSets(
30+
php82: true,
31+
);

‎build/rector.php‎

Lines changed: 2 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,9 @@
77
* SPDX-License-Identifier: AGPL-3.0-only
88
*/
99

10-
use Nextcloud\Rector\Set\NextcloudSets;
11-
use PhpParser\Node;
12-
use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
13-
use Rector\Config\RectorConfig;
14-
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
15-
use Rector\PHPUnit\Set\PHPUnitSetList;
16-
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
17-
use Rector\ValueObject\Application\File;
18-
1910
$nextcloudDir = dirname(__DIR__);
2011

21-
class NextcloudNamespaceSkipVoter implements ClassNameImportSkipVoterInterface {
22-
private array $namespacePrefixes = [
23-
'OC',
24-
'OCA',
25-
'OCP',
26-
];
27-
private array $skippedClassNames = [
28-
'Backend',
29-
'Connection',
30-
'Exception',
31-
'IManager',
32-
'IProvider',
33-
'Manager',
34-
'Plugin',
35-
'Provider',
36-
];
37-
public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node) : bool {
38-
if (in_array($fullyQualifiedObjectType->getShortName(), $this->skippedClassNames)) {
39-
// Skip common class names to avoid confusion
40-
return true;
41-
}
42-
foreach ($this->namespacePrefixes as $prefix) {
43-
if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix . '\\')) {
44-
// Import Nextcloud namespaces
45-
return false;
46-
}
47-
}
48-
// Skip everything else
49-
return true;
50-
}
51-
}
52-
53-
$config = RectorConfig::configure()
12+
return (require 'rector-shared.php')
5413
->withPaths([
5514
$nextcloudDir . '/apps',
5615
$nextcloudDir . '/core',
@@ -71,43 +30,4 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
7130
// $nextcloudDir . '/lib',
7231
// $nextcloudDir . '/themes',
7332
])
74-
->withSkip([
75-
$nextcloudDir . '/apps/*/3rdparty/*',
76-
$nextcloudDir . '/apps/*/build/stubs/*',
77-
$nextcloudDir . '/apps/*/composer/*',
78-
$nextcloudDir . '/apps/*/config/*',
79-
// The mock classes are excluded, as the tests explicitly test the annotations which should not be migrated to attributes
80-
$nextcloudDir . '/tests/lib/AppFramework/Middleware/Mock/*',
81-
$nextcloudDir . '/tests/lib/AppFramework/Middleware/Security/Mock/*',
82-
])
83-
// uncomment to reach your current PHP version
84-
// ->withPhpSets()
85-
->withImportNames(importShortClasses:false)
86-
->withTypeCoverageLevel(0)
87-
->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
88-
'inline_public' => true,
89-
'rename_property' => true,
90-
])
91-
->withSets([
92-
NextcloudSets::NEXTCLOUD_27,
93-
PHPUnitSetList::PHPUNIT_100,
94-
]);
95-
96-
$config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
97-
98-
/* Ignore all files ignored by git */
99-
$ignoredEntries = shell_exec('git status --porcelain --ignored ' . escapeshellarg($nextcloudDir));
100-
$ignoredEntries = explode("\n", $ignoredEntries);
101-
$ignoredEntries = array_filter($ignoredEntries, static fn (string $line) => str_starts_with($line, '!! '));
102-
$ignoredEntries = array_map(static fn (string $line) => substr($line, 3), $ignoredEntries);
103-
$ignoredEntries = array_values($ignoredEntries);
104-
105-
foreach ($ignoredEntries as $ignoredEntry) {
106-
if (str_ends_with($ignoredEntry, '/')) {
107-
$config->withSkip([$ignoredEntry . '*']);
108-
} else {
109-
$config->withSkip([$ignoredEntry . '/*']);
110-
}
111-
}
112-
113-
return $config;
33+
->withTypeCoverageLevel(0);

‎composer.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"psalm": "psalm --no-cache --threads=$(nproc)",
7171
"psalm:ocp": "psalm --no-cache --threads=$(nproc) -c psalm-ocp.xml",
7272
"psalm:ncu": "psalm --no-cache --threads=$(nproc) -c psalm-ncu.xml",
73+
"psalm:strict": "psalm --no-cache --threads=$(nproc) -c psalm-strict.xml",
7374
"psalm:security": "psalm --no-cache --threads=$(nproc) --taint-analysis --use-baseline=build/psalm-baseline-security.xml",
7475
"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
7576
"psalm:update-baseline": "psalm --no-cache --threads=$(nproc) --update-baseline",
@@ -85,6 +86,7 @@
8586
"test:db": "@composer run test -- --group DB --group SLOWDB",
8687
"test:files_external": "phpunit --fail-on-warning --fail-on-risky --display-warnings --display-deprecations --display-phpunit-deprecations --colors=always --configuration tests/phpunit-autotest-external.xml",
8788
"rector": "rector --config=build/rector.php && composer cs:fix",
89+
"rector:strict": "rector --config=build/rector-strict.php && composer cs:fix",
8890
"openapi": "./build/openapi-checker.sh"
8991
},
9092
"extra": {

‎psalm-strict.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
- SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
4+
- SPDX-License-Identifier: AGPL-3.0-or-later
5+
-->
6+
<psalm
7+
errorLevel="1"
8+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xmlns="https://getpsalm.org/schema/config"
10+
xsi:schemaLocation="https://getpsalm.org/schema/config"
11+
resolveFromConfigFile="false"
12+
findUnusedBaselineEntry="true"
13+
findUnusedCode="false"
14+
findUnusedPsalmSuppress="true"
15+
findUnusedVariablesAndParams="true"
16+
phpVersion="8.2"
17+
>
18+
<projectFiles>
19+
<ignoreFiles>
20+
<directory name="apps/**/composer"/>
21+
<directory name="apps/**/tests"/>
22+
<directory name="lib/composer"/>
23+
<directory name="lib/l10n"/>
24+
<directory name="3rdparty"/>
25+
</ignoreFiles>
26+
</projectFiles>
27+
<extraFiles>
28+
<directory name="3rdparty"/>
29+
</extraFiles>
30+
</psalm>

0 commit comments

Comments
 (0)