Codestyle fixes

owncloud · Apr 11, 2018 · 6842886 · 6842886
1 parent 26d53f3
commit 6842886
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/apps/files/lib/Command/VerifyChecksums.php b/apps/files/lib/Command/VerifyChecksums.php
@@ -76,10 +76,10 @@ public function __construct(IRootFolder $rootFolder, IUserManager $userManager)
 	protected function configure() {
 		$this
 			->setName('files:checksums:verify')
-			->setDescription("Get all checksums in filecache and compares them by recalculating the checksum of the file.")
-			->addOption('repair', 'r', InputOption::VALUE_NONE, "Repair filecache-entry with missmatched checksums.")
+			->setDescription('Get all checksums in filecache and compares them by recalculating the checksum of the file.')
+			->addOption('repair', 'r', InputOption::VALUE_NONE, 'Repair filecache-entry with mismatched checksums.')
 			->addOption('user', 'u', InputOption::VALUE_REQUIRED, 'Specific user to check')
-			->addOption('path', 'p', InputOption::VALUE_REQUIRED, "Path to check relative to data e.g /john/files/", '');
+			->addOption('path', 'p', InputOption::VALUE_REQUIRED, 'Path to check relative to data e.g /john/files/', '');
 	}
 
 	public function execute(InputInterface $input, OutputInterface $output) {
@@ -100,7 +100,7 @@ public function execute(InputInterface $input, OutputInterface $output) {
 			$path = $node->getInternalPath();
 			$currentChecksums = $node->getChecksum();
 
-			// Files without calculated checksum can`t cause checksum errors
+			// Files without calculated checksum can't cause checksum errors
 			if (empty($currentChecksums)) {
 				$output->writeln("Skipping $path => No Checksum", OutputInterface::VERBOSITY_VERBOSE);
 				return;
@@ -117,7 +117,7 @@ public function execute(InputInterface $input, OutputInterface $output) {
 				$this->exitStatus = self::EXIT_CHECKSUM_ERRORS;
 
 				if ($input->getOption('repair')) {
-					$output->writeln("<info>Repairing!</info>");
+					$output->writeln("<info>Repairing $path</info>");
 					$this->updateChecksumsForNode($node, $actualChecksums);
 					$this->exitStatus = self::EXIT_NO_ERRORS;
 				}

diff --git a/apps/files/tests/Command/VerifyChecksumsTest.php b/apps/files/tests/Command/VerifyChecksumsTest.php
@@ -148,9 +148,9 @@ private function assertChecksumsAreCorrect(array $files) {
 			$f = $files[$key]['file'];
 			$expectedChecksums = $files[$key]['expectedChecksums'];
 			$this->refreshFileInfo($files[$key]['file']);
-			$this->assertThat(
+			$this->assertSame(
 				$expectedChecksums(),
-				$this->equalTo($f->getChecksum())
+				$f->getChecksum()
 			);
 		}
 	}
@@ -160,7 +160,7 @@ public function testNoBrokenChecksums() {
 		$this->cmd->execute([]);
 		$exitCode = $this->cmd->getStatusCode();
 
-		$this->assertEquals(VerifyChecksums::EXIT_NO_ERRORS, $exitCode, "Wrong exit code");
+		$this->assertEquals(VerifyChecksums::EXIT_NO_ERRORS, $exitCode, 'Wrong exit code');
 		$this->assertChecksumsAreCorrect($this->testFiles);
 	}
 
@@ -178,7 +178,7 @@ public function testBrokenChecksumsAreNotRepairedWithoutArguments() {
 
 
 		$exitCode = $this->cmd->getStatusCode();
-		$this->assertEquals(VerifyChecksums::EXIT_CHECKSUM_ERRORS, $exitCode, "Wrong exit code");
+		$this->assertEquals(VerifyChecksums::EXIT_CHECKSUM_ERRORS, $exitCode, 'Wrong exit code');
 
 
 		$this->assertEquals(self::BROKEN_CHECKSUM_STRING, $file1->getChecksum());
@@ -222,7 +222,7 @@ public function testBrokenChecksumsResultInErrorExitCode() {
 		$this->assertEquals(self::BROKEN_CHECKSUM_STRING, $file1->getChecksum());
 
 		$exitCode = $this->cmd->getStatusCode();
-		$this->assertEquals(VerifyChecksums::EXIT_CHECKSUM_ERRORS, $exitCode, "Wrong exit code");
+		$this->assertEquals(VerifyChecksums::EXIT_CHECKSUM_ERRORS, $exitCode, 'Wrong exit code');
 
 	}