Merge pull request #231 from nextcloud/fix/bump-psalm-version

chore: Upgrade dev tools and apply upgraded rector

composer.json

@@ -38,7 +38,8 @@
 		"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml",
 		"psalm": "psalm --no-cache --threads=$(nproc)",
 		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
-		"psalm:update-baseline": "psalm --threads=1 --update-baseline"
+		"psalm:update-baseline": "psalm --threads=1 --update-baseline",
+		"rector": "rector && composer cs:fix"
 	},
 	"autoload-dev": {
 		"psr-4": {

lib/Command/Add.php

@@ -39,8 +39,8 @@
 
 class Add extends Base {
 	public function __construct(
-		private Configuration $configurationService,
-		private ?ConnectionImporter $connectionImporter = null,
+		private readonly Configuration $configurationService,
+		private readonly ?ConnectionImporter $connectionImporter = null,
 	) {
 		parent::__construct();
 	}
@@ -328,7 +328,7 @@ protected function askImport(InputInterface $input, OutputInterface $output): vo
 			$list,
 			count($list) - 1
 		);
-		$choice = $helper->ask($input, $output, $question);
+		$choice = (string)$helper->ask($input, $output, $question);
 		if ($choice === 'None') {
 			return;
 		}
@@ -354,7 +354,7 @@ protected function askStringToArray(string $subject, string $label, InputInterfa
 
 		$q = new Question($label);
 		$q->setNormalizer(fn ($input): string => $this->stringNormalizer($input));
-		$values = array_map('trim', explode(',', $helper->ask($input, $output, $q)));
+		$values = array_map('trim', explode(',', (string)$helper->ask($input, $output, $q)));
 
 		$input->setOption($subject, $values);
 	}

lib/Command/Delete.php

@@ -33,7 +33,7 @@
 
 class Delete extends Base {
 	public function __construct(
-		private Configuration $configurationService,
+		private readonly Configuration $configurationService,
 	) {
 		parent::__construct();
 	}

lib/Command/Edit.php

@@ -218,7 +218,7 @@ private function stringNormalizer(?string $input): string {
 	}
 
 	private function autoCompleteNormalizer($input, array $autoComplete) {
-		return array_change_key_case(array_flip($autoComplete))[strtolower($input)] ?? array_pop($autoComplete);
+		return array_change_key_case(array_flip($autoComplete))[strtolower((string)$input)] ?? array_pop($autoComplete);
 	}
 
 	private function uIntNormalizer(?string $input): ?int {
@@ -286,7 +286,7 @@ private function askStringToArray(string $subject, string $label, InputInterface
 
 		$q = new Question($label);
 		$q->setNormalizer(fn ($input): string => $this->stringNormalizer($input));
-		$values = array_map('trim', explode(',', $helper->ask($input, $output, $q)));
+		$values = array_map('trim', explode(',', (string)$helper->ask($input, $output, $q)));
 
 		$input->setOption($subject, $values);
 	}

lib/Command/ListConfigs.php

@@ -33,7 +33,7 @@
 
 class ListConfigs extends Base {
 	public function __construct(
-		private Configuration $configurationService,
+		private readonly Configuration $configurationService,
 	) {
 		parent::__construct();
 	}

lib/Controller/ContactsController.php

@@ -51,13 +51,13 @@
 class ContactsController extends Controller {
 	public function __construct(
 		IRequest $request,
-		private AddressBookProvider $addressBookProvider,
-		private IManager $contactsManager,
-		private IUserSession $userSession,
-		private LoggerInterface $logger,
-		private IURLGenerator $urlGenerator,
-		private PhotoService $photoService,
-		private IFactory $l10nFactory,
+		private readonly AddressBookProvider $addressBookProvider,
+		private readonly IManager $contactsManager,
+		private readonly IUserSession $userSession,
+		private readonly LoggerInterface $logger,
+		private readonly IURLGenerator $urlGenerator,
+		private readonly PhotoService $photoService,
+		private readonly IFactory $l10nFactory,
 	) {
 		parent::__construct(Application::APPID, $request);
 	}

lib/Http/InlineImageResponse.php

@@ -40,8 +40,8 @@ class InlineImageResponse extends Response implements ICallbackResponse {
 	public function __construct(Image $image) {
 		parent::__construct();
 
-		$etag = md5($image->data());
-		$ext = '.' . explode('/', $image->dataMimeType())[1];
+		$etag = md5((string)$image->data());
+		$ext = '.' . explode('/', (string)$image->dataMimeType())[1];
 
 		$this->setETag($etag);
 		$this->setStatus(Http::STATUS_OK);
@@ -55,7 +55,7 @@ public function __construct(Image $image) {
 	 */
 	public function callback(IOutput $output) {
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			$output->setHeader('Content-Length: ' . strlen($this->image->data()));
+			$output->setHeader('Content-Length: ' . strlen((string)$this->image->data()));
 			$output->setOutput($this->image->data());
 		}
 	}

lib/Model/Card.php

@@ -71,7 +71,7 @@ public function getETag() {
 	 * @inheritDoc
 	 */
 	public function getSize() {
-		return \strlen($this->get());
+		return \strlen((string)$this->get());
 	}
 
 	/**

lib/Provider/ImportProvider.php

@@ -36,14 +36,14 @@
 use OCP\IURLGenerator;
 
 class ImportProvider implements IProvider {
-	private CsrfTokenManager $tokenManager;
+	private readonly CsrfTokenManager $tokenManager;
 
 	public function __construct(
-		private IActionFactory $actionFactory,
-		private IURLGenerator $urlGenerator,
-		private IL10N $l,
+		private readonly IActionFactory $actionFactory,
+		private readonly IURLGenerator $urlGenerator,
+		private readonly IL10N $l,
 		CsrfTokenManager $tokenManager,
-		private IAppManager $appManager,
+		private readonly IAppManager $appManager,
 	) {
 		$this->tokenManager = $tokenManager;
 	}

lib/Service/AddressBook.php

@@ -33,10 +33,10 @@
 use Sabre\DAV\PropPatch;
 
 class AddressBook extends ExternalAddressBook {
-	private ICardBackend $cardBackend;
+	private readonly ICardBackend $cardBackend;
 
 	public function __construct(
-		private string $principalUri,
+		private readonly string $principalUri,
 		ICardBackend $cardBackend,
 	) {
 		parent::__construct(Application::APPID, $cardBackend->getURI());

lib/Service/AddressBookProvider.php

@@ -33,9 +33,9 @@
 
 class AddressBookProvider implements IAddressBookProvider {
 	public function __construct(
-		private Configuration $configurationService,
-		private LdapQuerentFactory $ldapQuerentFactory,
-		private ContactsAddressBookFactory $contactsAddressBookFactory,
+		private readonly Configuration $configurationService,
+		private readonly LdapQuerentFactory $ldapQuerentFactory,
+		private readonly ContactsAddressBookFactory $contactsAddressBookFactory,
 	) {
 	}
 

lib/Service/Configuration.php

@@ -39,8 +39,8 @@ class Configuration {
 	protected array $configurations = [];
 
 	public function __construct(
-		private IConfig $config,
-		private ICredentialsManager $credentialsManager,
+		private readonly IConfig $config,
+		private readonly ICredentialsManager $credentialsManager,
 	) {
 	}
 

lib/Service/ConnectionImporter.php

@@ -31,7 +31,7 @@
 use OutOfBoundsException;
 
 class ConnectionImporter {
-	private Helper $ldapHelper;
+	private readonly Helper $ldapHelper;
 
 	public function __construct(Helper $ldapHelper) {
 		$this->ldapHelper = $ldapHelper;

lib/Service/ContactsAddressBook.php

@@ -34,17 +34,17 @@
 use OCP\IURLGenerator;
 
 class ContactsAddressBook implements IAddressBook {
-	private CsrfTokenManager $tokenManager;
+	private readonly CsrfTokenManager $tokenManager;
 
 	public const DAV_PROPERTY_SOURCE = 'X-NC_LDAP_CONTACTS_ID';
 
 	public function __construct(
-		private ICardBackend $cardBackend,
-		private IConfig $config,
-		private IURLGenerator $urlGenerator,
+		private readonly ICardBackend $cardBackend,
+		private readonly IConfig $config,
+		private readonly IURLGenerator $urlGenerator,
 		CsrfTokenManager $tokenManager,
-		private PhotoService $photoService,
-		private ?string $principalURI = null,
+		private readonly PhotoService $photoService,
+		private readonly ?string $principalURI = null,
 	) {
 		$this->tokenManager = $tokenManager;
 	}
@@ -83,7 +83,7 @@ public function search($pattern, $searchProperties, $options) {
 			if (isset($record['PHOTO'])) {
 				try {
 					// "data:image/<submime>;base64," is prefixed
-					$imageData = substr($record['PHOTO'][0], strpos($record['PHOTO'][0], ','));
+					$imageData = substr((string)$record['PHOTO'][0], strpos((string)$record['PHOTO'][0], ','));
 					$this->photoService->store($this->cardBackend->getURI(), $record['URI'], $imageData);
 					$photoUrl = $this->urlGenerator->linkToRouteAbsolute(Application::APPID . '.contacts.photo',
 						[

lib/Service/ContactsAddressBookFactory.php

@@ -30,13 +30,13 @@
 use OCP\IURLGenerator;
 
 class ContactsAddressBookFactory {
-	private CsrfTokenManager $tokenManager;
+	private readonly CsrfTokenManager $tokenManager;
 
 	public function __construct(
-		private IConfig $config,
-		private IURLGenerator $urlGenerator,
+		private readonly IConfig $config,
+		private readonly IURLGenerator $urlGenerator,
 		CsrfTokenManager $tokenManager,
-		private PhotoService $photoService,
+		private readonly PhotoService $photoService,
 	) {
 		$this->tokenManager = $tokenManager;
 	}

lib/Service/ICardBackend.php

@@ -36,7 +36,7 @@ public function getDisplayName(): string;
 	/**
 	 * @throws RecordNotFound
 	 */
-	public function getCard($name): Card;
+	public function getCard(string $name): Card;
 
 	/**
 	 * @return Card[]

lib/Service/LdapCardBackend.php

@@ -33,8 +33,8 @@
 
 class LdapCardBackend implements ICardBackend {
 	public function __construct(
-		private LdapQuerent $ldapQuerent,
-		private ConfigurationModel $configuration,
+		private readonly LdapQuerent $ldapQuerent,
+		private readonly ConfigurationModel $configuration,
 	) {
 	}
 
@@ -49,7 +49,7 @@ public function getDisplayName(): string {
 	/**
 	 * @throws RecordNotFound
 	 */
-	public function getCard($name): Card {
+	public function getCard(string $name): Card {
 		$record = $this->ldapQuerent->fetchOne(base64_decode($name));
 		return $this->entryToCard($record);
 	}

lib/Service/LdapEntryToVcard.php

@@ -46,7 +46,7 @@ public static function convert(Entry $record, ConfigurationModel $configuration)
 		$mappings = array_merge(self::DEFAULT_MAPPING, $configuration->getAttributeMapping());
 		foreach ($mappings as $vcProperty => $lAttributes) {
 			$propertyName = strtoupper($vcProperty);
-			$lAttributes = explode(',', $lAttributes);
+			$lAttributes = explode(',', (string)$lAttributes);
 			foreach ($lAttributes as $lAttribute) {
 				$lAttribute = trim($lAttribute);
 				if ($lAttribute === 'dn') {

lib/Service/LdapQuerent.php

@@ -40,8 +40,8 @@ class LdapQuerent {
 	protected ?Ldap $ldap = null;
 
 	public function __construct(
-		private ConfigurationModel $configuration,
-		private LoggerInterface $logger,
+		private readonly ConfigurationModel $configuration,
+		private readonly LoggerInterface $logger,
 	) {
 	}
 

lib/Service/LdapQuerentFactory.php

@@ -30,7 +30,7 @@
 
 class LdapQuerentFactory {
 	public function __construct(
-		private LoggerInterface $logger,
+		private readonly LoggerInterface $logger,
 	) {
 	}
 

lib/Service/PhotoService.php

@@ -33,7 +33,7 @@
 
 class PhotoService {
 	public function __construct(
-		private ICacheFactory $cacheFactory,
+		private readonly ICacheFactory $cacheFactory,
 	) {
 	}
 
@@ -51,7 +51,7 @@ public function store(string $sourceId, string $entryId, string $imageData): boo
 		}
 
 		$image = $this->prepareImage($imageData);
-		$cache->set($key, base64_encode($image->data()), 3600);
+		$cache->set($key, base64_encode((string)$image->data()), 3600);
 
 		return true;
 	}

psalm.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <psalm
 	errorLevel="4"
-	phpVersion="8.0"
+	phpVersion="8.1"
 	resolveFromConfigFile="true"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns="https://getpsalm.org/schema/config"

rector.php

@@ -20,8 +20,5 @@
 	->withTypeCoverageLevel(10)
 	->withImportNames(importShortClasses: false)
 	->withSets([
-		NextcloudSets::NEXTCLOUD_25,
-		NextcloudSets::NEXTCLOUD_26,
 		NextcloudSets::NEXTCLOUD_27,
-		NextcloudSets::NEXTCLOUD_ALL,
 	]);

vendor-bin/rector/composer.json

@@ -1,7 +1,7 @@
 {
     "require-dev": {
         "rector/rector": "^1.2",
-        "nextcloud/rector": "^0.1.0"
+        "nextcloud/rector": "^0.2.1"
     },
     "config": {
         "platform": {