chore: rector

REUSE.toml

@@ -5,6 +5,12 @@ SPDX-PackageName = "contacts"
 SPDX-PackageSupplier = "Nextcloud <info@nextcloud.com>"
 SPDX-PackageDownloadLocation = "https://github.com/nextcloud/contacts"
 
+[[annotations]]
+path = ["vendor-bin/rector/composer.json", "vendor-bin/rector/composer.lock"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2026 Nextcloud GmbH and Nextcloud contributors"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
 [[annotations]]
 path = ["l10n/**.js", "l10n/**.json", "js/**.js.map", "js/**.js"]
 precedence = "aggregate"

composer.json

@@ -21,6 +21,8 @@
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:check:force": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --dry-run --diff",
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
+		"rector:apply": "rector && composer cs:fix",
+		"rector:check": "rector --dry-run",
 		"test:unit": "phpunit -c phpunit.xml --fail-on-warning",
 		"test:unit:coverage": "phpunit --coverage-clover coverage.xml -c phpunit.xml --fail-on-warning ",
 		"test:unit:dev": "phpunit -c phpunit.xml --fail-on-warning --stop-on-error --stop-on-failure",

lib/Cron/SocialUpdateRegistration.php

@@ -19,7 +19,7 @@
 use OCP\IUserManager;
 
 class SocialUpdateRegistration extends TimedJob {
-	private $appName;
+	private string $appName;
 
 	/**
 	 * RegisterSocialUpdate constructor.

lib/Dav/PatchPlugin.php

@@ -11,6 +11,7 @@
 
 use Sabre\CardDAV\Card;
 use Sabre\DAV;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
 use Sabre\HTTP\RequestInterface;
@@ -91,7 +92,7 @@ public function httpPatch(RequestInterface $request, ResponseInterface $response
 		// Init property name & value
 		$propertyName = $request->getHeader('X-Property');
 		if (is_null($propertyName)) {
-			throw new DAV\Exception\BadRequest('No valid "X-Property" found in the headers');
+			throw new BadRequest('No valid "X-Property" found in the headers');
 		}
 
 		$propertyData = $request->getHeader('X-Property-Replace');
@@ -100,7 +101,7 @@ public function httpPatch(RequestInterface $request, ResponseInterface $response
 			$propertyData = $request->getHeader('X-Property-Append');
 			$method = self::METHOD_APPEND;
 			if (is_null($propertyData)) {
-				throw new DAV\Exception\BadRequest('No valid "X-Property-Append" or "X-Property-Replace" found in the headers');
+				throw new BadRequest('No valid "X-Property-Append" or "X-Property-Replace" found in the headers');
 			}
 		}
 
@@ -112,7 +113,7 @@ public function httpPatch(RequestInterface $request, ResponseInterface $response
 
 		// We cannot know which one to update in that case
 		if (count($properties) > 1) {
-			throw new DAV\Exception\BadRequest('The specified property appear more than once');
+			throw new BadRequest('The specified property appear more than once');
 		}
 
 		// Init if not in the vcard

lib/Service/Social/CompositeSocialProvider.php

@@ -12,7 +12,7 @@
  */
 class CompositeSocialProvider {
 	/** @var ISocialProvider[] */
-	private $providers;
+	private array $providers;
 
 	public function __construct(InstagramProvider $instagramProvider,
 		MastodonProvider $mastodonProvider,

lib/Service/Social/DiasporaProvider.php

@@ -11,11 +11,9 @@
 use OCP\Http\Client\IClientService;
 
 class DiasporaProvider implements ISocialProvider {
-	/** @var IClient */
-	private $httpClient;
+	private IClient $httpClient;
 
-	/** @var bool */
-	private $looping;
+	private bool $looping;
 
 	/** @var string */
 	public $name = 'diaspora';

lib/Service/Social/FacebookProvider.php

@@ -11,8 +11,7 @@
 use OCP\Http\Client\IClientService;
 
 class FacebookProvider implements ISocialProvider {
-	/** @var IClient */
-	private $httpClient;
+	private IClient $httpClient;
 
 	/** @var string */
 	public $name = 'facebook';

lib/Service/Social/InstagramProvider.php

@@ -13,19 +13,16 @@
 use Psr\Log\LoggerInterface;
 
 class InstagramProvider implements ISocialProvider {
-	/** @var IClient */
-	private $httpClient;
-
-	/** @var LoggerInterface */
-	private $logger;
+	private IClient $httpClient;
 
 	/** @var string */
 	public $name = 'instagram';
 
-	public function __construct(IClientService $httpClient,
-		LoggerInterface $logger) {
+	public function __construct(
+		IClientService $httpClient,
+		private LoggerInterface $logger,
+	) {
 		$this->httpClient = $httpClient->newClient();
-		$this->logger = $logger;
 	}
 
 	/**

lib/Service/Social/MastodonProvider.php

@@ -11,8 +11,7 @@
 use OCP\Http\Client\IClientService;
 
 class MastodonProvider implements ISocialProvider {
-	/** @var IClient */
-	private $httpClient;
+	private IClient $httpClient;
 
 	/** @var string */
 	public $name = 'mastodon';

lib/Service/Social/TelegramProvider.php

@@ -13,19 +13,16 @@
 use Psr\Log\LoggerInterface;
 
 class TelegramProvider implements ISocialProvider {
-	/** @var IClient */
-	private $httpClient;
-
-	/** @var LoggerInterface */
-	private $logger;
+	private IClient $httpClient;
 
 	/** @var string */
 	public $name = 'telegram';
 
-	public function __construct(IClientService $httpClient,
-		LoggerInterface $logger) {
+	public function __construct(
+		IClientService $httpClient,
+		private LoggerInterface $logger,
+	) {
 		$this->httpClient = $httpClient->newClient();
-		$this->logger = $logger;
 	}
 
 	/**

lib/Service/Social/XingProvider.php

@@ -11,8 +11,7 @@
 use OCP\Http\Client\IClientService;
 
 class XingProvider implements ISocialProvider {
-	/** @var IClient */
-	private $httpClient;
+	private IClient $httpClient;
 
 	/** @var string */
 	public $name = 'xing';

lib/Service/SocialApiService.php

@@ -32,7 +32,7 @@ class SocialApiService {
 		'image/jpeg',
 		'image/gif'
 	];
-	private $appName;
+	private string $appName;
 
 	public function __construct(
 		private CompositeSocialProvider $socialProvider,

rector.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+use Rector\Config\RectorConfig;
+use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
+use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
+use Rector\ValueObject\PhpVersion;
+
+return RectorConfig::configure()
+	->withPaths([
+		__DIR__ . '/appinfo/routes.php',
+		__DIR__ . '/lib',
+		__DIR__ . '/tests/unit',
+	])
+	->withAutoloadPaths([
+		__DIR__ . '/vendor-bin/rector/vendor/nextcloud/ocp/OCP',
+	])
+	->withImportNames(importShortClasses: false)
+	->withPhpVersion(PhpVersion::PHP_82)
+	->withRules([
+		TypedPropertyFromStrictConstructorRector::class,
+	])
+	->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
+		'inline_public' => true,
+		'rename_property' => true,
+	]);

vendor-bin/rector/composer.json

@@ -0,0 +1,11 @@
+{
+    "config": {
+        "platform": {
+            "php": "8.1"
+        },
+        "sort-packages": true
+    },
+    "require-dev": {
+        "nextcloud/rector": "^0.5.2"
+    }
+}