Merge pull request #39683 from owncloud/enterprise-4946

phil-davis · web-flow · commit 66ed39dcc6ee · 2022-01-12T18:23:05.000+05:45
Fix files:checksums:verify for a single file
diff --git a/apps/files/lib/Command/VerifyChecksums.php b/apps/files/lib/Command/VerifyChecksums.php
@@ -115,7 +115,7 @@ public function execute(InputInterface $input, OutputInterface $output) {
 					$this->exitStatus = self::EXIT_INVALID_ARGS;
 					return $this->exitStatus;
 				}
-				if ($node === FileInfo::TYPE_FILE) {
+				if ($node->getType() === FileInfo::TYPE_FILE) {
 					$this->verifyChecksumsForFile($node, $input, $output);
 				} else {
 					$this->verifyChecksumsForFolder($node, $input, $output);
diff --git a/apps/files/tests/Command/VerifyChecksumsTest.php b/apps/files/tests/Command/VerifyChecksumsTest.php
@@ -117,7 +117,7 @@ private function createFileForUser($uid, $path, $content) {
 	 * @return bool|IUser
 	 */
 	private function createRandomUser($number) {
-		$userName = $this->getUniqueID("$number-verifycheksums");
+		$userName = $this->getUniqueID("$number-verifychecksums");
 		$user = $this->createUser($userName);
 		$this->loginAsUser($userName);
 
@@ -271,6 +271,32 @@ public function testOnlyFilesInGivenPathArgumentAreRepaired() {
 		$this->assertEquals(self::BROKEN_CHECKSUM_STRING, $file4->getChecksum());
 	}
 
+	/**
+	 * @depends testBrokenFilesAreRepairedWithRepairArgument
+	 */
+	public function testSingleFileInGivenPathArgumentIsRepaired() {
+
+		/** @var File $file1 */
+		$file1 = $this->testFiles[0]['file'];
+		/** @var File $file2 */
+		$file2 = $this->testFiles[1]['file'];
+
+		$this->breakChecksum($file1);
+		$this->breakChecksum($file2);
+
+		$this->cmd->execute([
+			'-r' => null,
+			'-u' => $this->user1,
+			'-p' => "dir/nested/somefile.txt"
+		]);
+
+		$this->assertChecksumsAreCorrect([
+			$this->testFiles[0],
+		]);
+
+		$this->assertEquals(self::BROKEN_CHECKSUM_STRING, $file2->getChecksum());
+	}
+
 	public function testOnlyFilesOfAGivenUserAreRepaired() {
 
 		/** @var File $file1 */
diff --git a/changelog/unreleased/39683 b/changelog/unreleased/39683
@@ -0,0 +1,5 @@
+Bugfix: Fix files:checksums:verify for a single file
+
+Fixed an issue where running files:checksums:verify for a single file would fail.
+
+https://github.com/owncloud/core/pull/39683

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function execute(InputInterface $input, OutputInterface $output) {`
`115`	`115`	`$this->exitStatus = self::EXIT_INVALID_ARGS;`
`116`	`116`	`return $this->exitStatus;`
`117`	`117`	`}`
`118`		`- if ($node === FileInfo::TYPE_FILE) {`
	`118`	`+ if ($node->getType() === FileInfo::TYPE_FILE) {`
`119`	`119`	`$this->verifyChecksumsForFile($node, $input, $output);`
`120`	`120`	`} else {`
`121`	`121`	`$this->verifyChecksumsForFolder($node, $input, $output);`