fix: false renames of fetch()

Author: DeepDiver1975

apps/files_external/tests/Command/CommandTest.php

@@ -100,6 +100,6 @@ protected function getInput(Command $command, array $arguments = [], array $opti
 	protected function executeCommand(Command $command, Input $input) {
 		$output = new BufferedOutput();
 		self::invokePrivate($command, 'execute', [$input, $output]);
-		return $output->fetchAssociative();
+		return $output->fetch();
 	}
 }

apps/files_external/tests/Command/ConfigCommandTest.php

@@ -85,7 +85,7 @@ public function testSetConfigValue($value) {
 
 		$output = new BufferedOutput();
 		$result = self::invokePrivate($command, 'getOption', [$mount, 'filesystem_check_changes', $output]);
-		$this->assertEquals($value, \trim($output->fetchAssociative()));
+		$this->assertEquals($value, \trim($output->fetch()));
 	}
 
 	public function optionsProvider() {

apps/files_external/tests/Command/ListCommandTest.php

@@ -67,7 +67,7 @@ public function testListAuthIdentifier() {
 		$output = new BufferedOutput();
 
 		$instance->listMounts('', [$mount1, $mount2], $input, $output);
-		$output = \json_decode($output->fetchAssociative(), true);
+		$output = \json_decode($output->fetch(), true);
 
 		$this->assertNotEquals($output[0]['authentication_type'], $output[1]['authentication_type']);
 	}
@@ -88,7 +88,7 @@ public function testDisplayWarningForIncomplete() {
 		$output = new BufferedOutput();
 
 		$instance->listMounts('', [$mount1, $mount2], $input, $output);
-		$output = $output->fetchAssociative();
+		$output = $output->fetch();
 
 		$this->assertMatchesRegularExpression('/Number of invalid storages found/', $output);
 	}
@@ -154,7 +154,7 @@ public function testShortView($options, $expectedResult, $mountOptions) {
 		$output = new BufferedOutput();
 
 		$instance->listMounts('user1', [$mount1, $mount2], $input, $output);
-		$output = $output->fetchAssociative();
+		$output = $output->fetch();
 		if (isset($options['output']) && ($options['output'] === 'json')) {
 			$results = \json_decode($output, true);
 			$countResults = \count($results);
@@ -229,7 +229,7 @@ public function testLongView($options, $expectedResult, $mountOptions) {
 		$output = new BufferedOutput();
 
 		$instance->listMounts('user1', [$mount1, $mount2], $input, $output);
-		$output = $output->fetchAssociative();
+		$output = $output->fetch();
 		if (isset($options['output']) && ($options['output'] === 'json')) {
 			$results = \json_decode($output, true);
 			$countResults = \count($results);
@@ -302,7 +302,7 @@ public function testImportableFormat($options, $expectedResult, $mountOptions) {
 		$output = new BufferedOutput();
 
 		$instance->listMounts('user1', [$mount1, $mount2], $input, $output);
-		$output = $output->fetchAssociative();
+		$output = $output->fetch();
 		if (isset($options['output']) && ($options['output'] === 'json')) {
 			$results = \json_decode($output, true);
 			$countResults = \count($results);

lib/private/Comments/Manager.php

@@ -162,9 +162,9 @@ protected function updateChildrenInformation($id, \DateTime $cDateTime) {
 				->setParameter('id', $id);
 
 		$resultStatement = $query->execute();
-		$data = $resultStatement->fetch(\PDO::FETCH_NUM);
+		$data = $resultStatement->fetchNumeric();
 		$resultStatement->free();
-		$children = \intval($data[0]);
+		$children = (int)$data[0];
 
 		$comment = $this->get($id);
 		$comment->setChildrenCount($children);
@@ -443,9 +443,9 @@ public function getNumberOfCommentsForObject($objectType, $objectId, \DateTime $
 		}
 
 		$resultStatement = $query->execute();
-		$data = $resultStatement->fetch(\PDO::FETCH_NUM);
+		$data = $resultStatement->fetchNumeric();
 		$resultStatement->free();
-		return \intval($data[0]);
+		return (int)$data[0];
 	}
 
 	/**

lib/private/DB/Connection.php

@@ -182,7 +182,7 @@ public function prepare($statement, $limit=null, $offset=null) : \Doctrine\DBAL\
 	 * @param array                                       $types  The types the previous parameters are in.
 	 * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
 	 *
-	 * @return \Doctrine\DBAL\Driver\Statement The executed statement.
+	 * @return Result The executed statement.
 	 *
 	 * @throws \Doctrine\DBAL\Exception
 	 */

lib/private/SystemTag/SystemTagObjectMapper.php

@@ -237,14 +237,14 @@ public function haveTag($objIds, $objectType, $tagId, $all = true) {
 			->setParameter('objecttype', $objectType);
 
 		$result = $query->execute();
-		$row = $result->fetch(\PDO::FETCH_NUM);
+		$row = $result->fetchNumeric();
 		$result->free();
 
 		if ($all) {
 			return ((int)$row[0] === \count($objIds));
-		} else {
-			return (bool) $row;
 		}
+
+		return (bool) $row;
 	}
 
 	/**

lib/private/legacy/util.php

@@ -967,7 +967,8 @@ public static function checkDatabaseVersion() {
 			// check PostgreSQL version
 			try {
 				$result = \OC::$server->getDatabaseConnection()->executeQuery('SHOW SERVER_VERSION');
-				$data = $result->fetch();
+				$data = $result->fetchAssociative();
+				$result->free();
 				if (isset($data['server_version'])) {
 					$version = $data['server_version'];
 					if (\version_compare($version, '9.0.0', '<')) {

tests/lib/Repair/RepairMimeTypesTest.php

@@ -96,7 +96,8 @@ private function getMimeTypeIdFromDB($mimeType) {
 		$sql = 'SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?';
 		$connection = \OC::$server->getDatabaseConnection();
 		$results = $connection->executeQuery($sql, [$mimeType]);
-		$result = $results->fetch();
+		$result = $results->fetchAssociative();
+		$results->free();
 		if ($result) {
 			return $result['id'];
 		}