style: 🎨 add nextcloud/rector
All checks were successful
repod / xml (push) Successful in 22s
repod / php (push) Successful in 1m15s
repod / nodejs (push) Successful in 1m6s
repod / release (push) Has been skipped

This commit is contained in:
Michel Roux 2024-11-12 10:11:21 +01:00
parent 7e6536c7ee
commit 1d8ea08798
16 changed files with 179 additions and 95 deletions

View File

@ -19,6 +19,7 @@
"nextcloud/ocp": "^30.0.2",
"roave/security-advisories": "dev-latest",
"nextcloud/coding-standard": "^1.3.2",
"nextcloud/rector": "^0.2.1",
"rector/rector": "^1.2.10",
"vimeo/psalm": "^5.26.1"
},

78
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "f63004cd7dd2ace25dfec89f0ea70b76",
"content-hash": "8cc17a92fa79c3374c5080bb3b08c3db",
"packages": [],
"packages-dev": [
{
@ -822,6 +822,68 @@
},
"time": "2024-10-19T00:42:39+00:00"
},
{
"name": "nextcloud/rector",
"version": "v0.2.1",
"source": {
"type": "git",
"url": "https://github.com/nextcloud-libraries/rector.git",
"reference": "d73ab086700564f675eda9a834b6b08410a1da7e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nextcloud-libraries/rector/zipball/d73ab086700564f675eda9a834b6b08410a1da7e",
"reference": "d73ab086700564f675eda9a834b6b08410a1da7e",
"shasum": ""
},
"require": {
"php": "^8.1"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
"ramsey/devtools": "^2.0",
"rector/rector": "^1.2"
},
"type": "library",
"extra": {
"captainhook": {
"force-install": true
},
"ramsey/conventional-commits": {
"configFile": "conventional-commits.json"
},
"ramsey/devtools": {
"command-prefix": "dev",
"memory-limit": "-1"
}
},
"autoload": {
"psr-4": {
"Nextcloud\\Rector\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"AGPL-3.0-or-later"
],
"authors": [
{
"name": "Christoph Wurst",
"email": "christoph@winzerhof-wurst.at",
"homepage": "https://wuc.me"
}
],
"description": "Rector upgrade rules for Nextcloud",
"keywords": [
"nextcloud",
"refactoring"
],
"support": {
"issues": "https://github.com/nextcloud-libraries/rector/issues",
"source": "https://github.com/nextcloud-libraries/rector/tree/v0.2.1"
},
"time": "2024-10-01T12:24:08+00:00"
},
{
"name": "nikic/php-parser",
"version": "v4.19.4",
@ -1154,16 +1216,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.12.8",
"version": "1.12.10",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "f6a60a4d66142b8156c9da923f1972657bc4748c"
"reference": "fc463b5d0fe906dcf19689be692c65c50406a071"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c",
"reference": "f6a60a4d66142b8156c9da923f1972657bc4748c",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc463b5d0fe906dcf19689be692c65c50406a071",
"reference": "fc463b5d0fe906dcf19689be692c65c50406a071",
"shasum": ""
},
"require": {
@ -1208,7 +1270,7 @@
"type": "github"
}
],
"time": "2024-11-06T19:06:49+00:00"
"time": "2024-11-11T15:37:09+00:00"
},
{
"name": "psr/clock",
@ -3336,8 +3398,8 @@
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {},
"platform-dev": {},
"platform": [],
"platform-dev": [],
"platform-overrides": {
"php": "8.1"
},

View File

@ -22,10 +22,10 @@ class EpisodesController extends Controller
{
public function __construct(
IRequest $request,
private EpisodeActionReader $episodeActionReader,
private EpisodeActionRepository $episodeActionRepository,
private IClientService $clientService,
private UserService $userService
private readonly EpisodeActionReader $episodeActionReader,
private readonly EpisodeActionRepository $episodeActionRepository,
private readonly IClientService $clientService,
private readonly UserService $userService
) {
parent::__construct(Application::APP_ID, $request);
}

View File

@ -22,11 +22,11 @@ class OpmlController extends Controller
{
public function __construct(
IRequest $request,
private IL10N $l10n,
private PodcastDataReader $podcastDataReader,
private PodcastMetricsReader $podcastMetricsReader,
private SubscriptionChangeSaver $subscriptionChangeSaver,
private UserService $userService
private readonly IL10N $l10n,
private readonly PodcastDataReader $podcastDataReader,
private readonly PodcastMetricsReader $podcastMetricsReader,
private readonly SubscriptionChangeSaver $subscriptionChangeSaver,
private readonly UserService $userService
) {
parent::__construct(Application::APP_ID, $request);
}

View File

@ -20,9 +20,9 @@ class PodcastController extends Controller
{
public function __construct(
IRequest $request,
private ICacheFactory $cacheFactory,
private IClientService $clientService,
private PodcastDataReader $podcastDataReader
private readonly ICacheFactory $cacheFactory,
private readonly IClientService $clientService,
private readonly PodcastDataReader $podcastDataReader
) {
parent::__construct(Application::APP_ID, $request);
}

View File

@ -17,7 +17,7 @@ class SearchController extends Controller
{
public function __construct(
IRequest $request,
private MultiPodService $multiPodService
private readonly MultiPodService $multiPodService
) {
parent::__construct(Application::APP_ID, $request);
}

View File

@ -17,7 +17,7 @@ class ToplistController extends Controller
{
public function __construct(
IRequest $request,
private FyydService $fyydService
private readonly FyydService $fyydService
) {
parent::__construct(Application::APP_ID, $request);
}

View File

@ -31,19 +31,19 @@ use OCA\GPodderSync\Core\EpisodeAction\EpisodeAction;
class EpisodeActionExtraData implements \JsonSerializable, \Stringable
{
public function __construct(
private string $title,
private ?string $url,
private string $name,
private ?string $link,
private ?string $image,
private ?string $description,
private int $fetchedAtUnix,
private string $guid,
private ?string $type,
private ?int $size,
private ?\DateTime $pubDate,
private ?string $duration,
private ?EpisodeAction $action
private readonly string $title,
private readonly ?string $url,
private readonly string $name,
private readonly ?string $link,
private readonly ?string $image,
private readonly ?string $description,
private readonly int $fetchedAtUnix,
private readonly string $guid,
private readonly ?string $type,
private readonly ?int $size,
private readonly ?\DateTime $pubDate,
private readonly ?string $duration,
private readonly ?EpisodeAction $action
) {}
public function __toString(): string {

View File

@ -11,8 +11,8 @@ use OCA\RePod\Service\UserService;
class EpisodeActionReader extends CoreEpisodeActionReader
{
public function __construct(
private EpisodeActionRepository $episodeActionRepository,
private UserService $userService
private readonly EpisodeActionRepository $episodeActionRepository,
private readonly UserService $userService
) {}
/**

View File

@ -13,9 +13,9 @@ class FyydService implements IPodProvider
private const BASE_URL = 'https://api.fyyd.de/0.2/';
public function __construct(
private IClientService $clientService,
private LoggerInterface $logger,
private UserService $userService
private readonly IClientService $clientService,
private readonly LoggerInterface $logger,
private readonly UserService $userService
) {}
public function search(string $value): array {

View File

@ -12,8 +12,8 @@ class ItunesService implements IPodProvider
private const BASE_URL = 'https://itunes.apple.com/';
public function __construct(
private IClientService $clientService,
private UserService $userService
private readonly IClientService $clientService,
private readonly UserService $userService
) {}
public function search(string $value): array {

View File

@ -17,7 +17,7 @@ class MultiPodService implements IPodProvider
public function __construct(
FyydService $fyydService,
ItunesService $itunesService,
private LoggerInterface $logger
private readonly LoggerInterface $logger
) {
$this->providers = [$fyydService, $itunesService];
}

View File

@ -16,9 +16,9 @@ use OCP\Search\SearchResultEntry;
class SearchProvider implements IProvider
{
public function __construct(
private IL10N $l10n,
private IURLGenerator $urlGenerator,
private MultiPodService $multiPodService
private readonly IL10N $l10n,
private readonly IURLGenerator $urlGenerator,
private readonly MultiPodService $multiPodService
) {}
public function getId(): string {

View File

@ -10,8 +10,8 @@ use OCP\L10N\IFactory;
class UserService
{
public function __construct(
private IFactory $l10n,
private IUserSession $userSession
private readonly IFactory $l10n,
private readonly IUserSession $userSession
) {}
public function getUserUID(): string {

108
package-lock.json generated
View File

@ -2801,9 +2801,9 @@
"license": "ISC"
},
"node_modules/@vitejs/plugin-vue": {
"version": "5.1.4",
"resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.4.tgz",
"integrity": "sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==",
"version": "5.1.5",
"resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.5.tgz",
"integrity": "sha512-dlnib73G05CDBAUR/YpuZcQQ47fpjihnnNouAAqN62z+oqSsWJ+kh52GRzIxpkgFG3q11eXK7Di7RMmoCwISZA==",
"license": "MIT",
"engines": {
"node": "^18.0.0 || >=20.0.0"
@ -3210,9 +3210,9 @@
}
},
"node_modules/alien-signals": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.2.0.tgz",
"integrity": "sha512-StlonZhBBrsPPwrDjiPAiVTf/rolxffLxVPT60Qv/t88BZ81BvUVzHgGqEFvJ1ii8HXtm1+zU2Icr59tfWEcag==",
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.2.1.tgz",
"integrity": "sha512-FlEQrDJe9r2RI4cDlnK2zYqJezvx1uJaWEuwxsnlFqnPwvJbgitNBRumWrLDv8lA+7cCikpMxfJD2TTHiaTklA==",
"dev": true,
"license": "MIT"
},
@ -3420,9 +3420,9 @@
}
},
"node_modules/asn1.js/node_modules/bn.js": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
"version": "4.12.1",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
"license": "MIT"
},
"node_modules/assert": {
@ -3847,9 +3847,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001679",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz",
"integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==",
"version": "1.0.30001680",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
"integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==",
"funding": [
{
"type": "opencollective",
@ -4157,9 +4157,9 @@
}
},
"node_modules/create-ecdh/node_modules/bn.js": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
"version": "4.12.1",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
"license": "MIT"
},
"node_modules/create-hash": {
@ -4535,9 +4535,9 @@
}
},
"node_modules/diffie-hellman/node_modules/bn.js": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
"version": "4.12.1",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
"license": "MIT"
},
"node_modules/dir-glob": {
@ -4649,9 +4649,9 @@
}
},
"node_modules/electron-to-chromium": {
"version": "1.5.55",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz",
"integrity": "sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg==",
"version": "1.5.56",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.56.tgz",
"integrity": "sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==",
"license": "ISC"
},
"node_modules/elliptic": {
@ -4670,9 +4670,9 @@
}
},
"node_modules/elliptic/node_modules/bn.js": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
"version": "4.12.1",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
"license": "MIT"
},
"node_modules/emoji-mart-vue-fast": {
@ -5498,9 +5498,9 @@
}
},
"node_modules/eslint-plugin-vue": {
"version": "9.30.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.30.0.tgz",
"integrity": "sha512-CyqlRgShvljFkOeYK8wN5frh/OGTvkj1S7wlr2Q2pUvwq+X5VYiLd6ZjujpgSgLnys2W8qrBLkXQ41SUYaoPIQ==",
"version": "9.31.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.31.0.tgz",
"integrity": "sha512-aYMUCgivhz1o4tLkRHj5oq9YgYPM4/EJc0M7TAKRLCUA5OYxRLAhYEVD2nLtTwLyixEFI+/QXSvKU9ESZFgqjQ==",
"dev": true,
"license": "MIT",
"peer": true,
@ -6034,9 +6034,9 @@
}
},
"node_modules/focus-trap": {
"version": "7.6.0",
"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.0.tgz",
"integrity": "sha512-1td0l3pMkWJLFipobUcGaf+5DTY4PLDDrcqoSaKP8ediO/CoWCCYk/fT/Y2A4e6TNB+Sh6clRJCjOPPnKoNHnQ==",
"version": "7.6.1",
"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.1.tgz",
"integrity": "sha512-nB8y4nQl8PshahLpGKZOq1sb0xrMVFSn6at7u/qOsBZTlZRzaapISGENcB6mOkoezbClZyiMwEF/dGY8AZ00rA==",
"license": "MIT",
"dependencies": {
"tabbable": "^6.2.0"
@ -8538,9 +8538,9 @@
}
},
"node_modules/miller-rabin/node_modules/bn.js": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
"version": "4.12.1",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
"license": "MIT"
},
"node_modules/mime-db": {
@ -9171,9 +9171,9 @@
}
},
"node_modules/postcss": {
"version": "8.4.47",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
"integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
"version": "8.4.49",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
"integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
"funding": [
{
"type": "opencollective",
@ -9191,7 +9191,7 @@
"license": "MIT",
"dependencies": {
"nanoid": "^3.3.7",
"picocolors": "^1.1.0",
"picocolors": "^1.1.1",
"source-map-js": "^1.2.1"
},
"engines": {
@ -9414,9 +9414,9 @@
}
},
"node_modules/public-encrypt/node_modules/bn.js": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
"version": "4.12.1",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
"license": "MIT"
},
"node_modules/punycode": {
@ -10740,17 +10740,17 @@
}
},
"node_modules/stylelint-scss": {
"version": "6.8.1",
"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.8.1.tgz",
"integrity": "sha512-al+5eRb72bKrFyVAY+CLWKUMX+k+wsDCgyooSfhISJA2exqnJq1PX1iIIpdrvhu3GtJgNJZl9/BIW6EVSMCxdg==",
"version": "6.9.0",
"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.9.0.tgz",
"integrity": "sha512-oWOR+g6ccagfrENecImGmorWWjVyWpt2R8bmkhOW8FkNNPGStZPQMqb8QWMW4Lwu9TyPqmyjHkkAsy3weqsnNw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"css-tree": "^3.0.0",
"css-tree": "^3.0.1",
"is-plain-object": "^5.0.0",
"known-css-properties": "^0.34.0",
"mdn-data": "^2.11.1",
"known-css-properties": "^0.35.0",
"mdn-data": "^2.12.2",
"postcss-media-query-parser": "^0.2.3",
"postcss-resolve-nested-selector": "^0.1.6",
"postcss-selector-parser": "^6.1.2",
@ -10763,6 +10763,22 @@
"stylelint": "^16.0.2"
}
},
"node_modules/stylelint-scss/node_modules/known-css-properties": {
"version": "0.35.0",
"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.35.0.tgz",
"integrity": "sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==",
"dev": true,
"license": "MIT",
"peer": true
},
"node_modules/stylelint-scss/node_modules/mdn-data": {
"version": "2.12.2",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
"integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
"dev": true,
"license": "CC0-1.0",
"peer": true
},
"node_modules/stylelint/node_modules/balanced-match": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",

View File

@ -2,13 +2,18 @@
declare(strict_types=1);
use Nextcloud\Rector\Set\NextcloudSets;
use Rector\Config\RectorConfig;
return RectorConfig::configure()
->withPaths([
__DIR__.'/appinfo',
__DIR__.'/lib',
])
->withPhpSets(php80: true)
->withPhpSets(php81: true)
->withSets([
NextcloudSets::NEXTCLOUD_27,
])
->withPreparedSets(
deadCode: true,
codeQuality: true,