Merge pull request #3369 from nextcloud/refactor/constructor-property-promotion

Author: provokateurin

lib/ACL/ACLStorageWrapper.php

@@ -176,10 +176,8 @@ public function writeStream(string $path, $stream, ?int $size = null): int {
 
 	/**
 	 * @inheritDoc
-	 * @param string $path
-	 * @param ?IStorage $storage
 	 */
-	public function getCache($path = '', $storage = null): ICache {
+	public function getCache(string $path = '', ?IStorage $storage = null): ICache {
 		if (!$storage) {
 			$storage = $this;
 		}
@@ -202,10 +200,8 @@ public function getMetaData(string $path): ?array {
 
 	/**
 	 * @inheritDoc
-	 * @param string $path
-	 * @param ?IStorage $storage
 	 */
-	public function getScanner($path = '', $storage = null): IScanner {
+	public function getScanner(string $path = '', ?IStorage $storage = null): IScanner {
 		if (!$storage) {
 			$storage = $this->storage;
 		}

lib/Mount/GroupFolderStorage.php

@@ -49,10 +49,8 @@ public function getOwner(string $path): string|false {
 
 	/**
 	 * @inheritDoc
-	 * @param string $path
-	 * @param ?IStorage $storage
 	 */
-	public function getCache($path = '', $storage = null): ICache {
+	public function getCache(string $path = '', ?IStorage $storage = null): ICache {
 		if ($this->cache) {
 			return $this->cache;
 		}

lib/Mount/RootPermissionsMask.php

@@ -88,11 +88,7 @@ public function getMetaData(string $path): ?array {
 		return $data;
 	}
 
-	/**
-	 * @param string $path
-	 * @param ?IStorage $storage
-	 */
-	public function getCache($path = '', $storage = null): ICache {
+	public function getCache(string $path = '', ?IStorage $storage = null): ICache {
 		if (!$storage) {
 			$storage = $this;
 		}

lib/Trash/GroupTrashItem.php

@@ -14,20 +14,17 @@
 use OCP\IUser;
 
 class GroupTrashItem extends TrashItem {
-	private string $internalOriginalLocation;
-
 	public function __construct(
 		ITrashBackend $backend,
-		string $originalLocation,
+		private string $internalOriginalLocation,
 		int $deletedTime,
 		string $trashPath,
 		FileInfo $fileInfo,
 		IUser $user,
 		private string $mountPoint,
 		?IUser $deletedBy,
 	) {
-		$this->internalOriginalLocation = $originalLocation;
-		parent::__construct($backend, $this->mountPoint . '/' . $originalLocation, $deletedTime, $trashPath, $fileInfo, $user, $deletedBy);
+		parent::__construct($backend, $this->mountPoint . '/' . $this->internalOriginalLocation, $deletedTime, $trashPath, $fileInfo, $user, $deletedBy);
 	}
 
 	public function getInternalOriginalLocation(): string {

rector.php

@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 use Rector\Config\RectorConfig;
+use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 
 return RectorConfig::configure()
 	->withPaths([
@@ -20,4 +21,7 @@
 		typeDeclarations: true,
 	)->withPhpSets(
 		php81: true,
-	);
+	)->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
+		'inline_public' => true,
+		'rename_property' => true,
+	]);

tests/Folder/FolderManagerTest.php

@@ -454,7 +454,7 @@ public function testQuotaDefaultValue(): void {
 		$this->config->expects($this->any())
 			->method('getSystemValueInt')
 			->with('groupfolders.quota.default', FileInfo::SPACE_UNLIMITED)
-			->willReturnCallback(function () use (&$exponent) {
+			->willReturnCallback(function () use (&$exponent): int {
 				return 1024 ** ($exponent++);
 			});