Merge pull request #988 from nextcloud/carl/port-away-execute

chore(migration): Port away from deprecated IQueryBuilder::execute

Author: CarlSchwan

REUSE.toml

@@ -106,3 +106,9 @@ path = "tests/integration/vendor/symfony/**"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "Fabien Potencier"
 SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = ["tests/stubs/doctrine_dbal_**"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "none"
+SPDX-License-Identifier = "MIT"

lib/Migration/Version5000Date20211025124248.php

@@ -151,7 +151,7 @@ protected function deleteOldConfiguration(array $keys): bool {
 
 		$deletedRows = $this->deleteQuery
 			->setParameter('cfgKeys', $keys, IQueryBuilder::PARAM_STR_ARRAY)
-			->execute();
+			->executeStatement();
 
 		return $deletedRows > 0;
 	}
@@ -174,7 +174,7 @@ protected function insertConfiguration(int $id, array $configData): bool {
 			->setParameter('configId', $id)
 			->setParameter('displayName', $configData['general-idp0_display_name'] ?? '')
 			->setParameter('configuration', \json_encode($configData, JSON_THROW_ON_ERROR))
-			->execute();
+			->executeStatement();
 
 		return $insertedRows > 0;
 	}
@@ -190,7 +190,7 @@ protected function readConfiguration(array $configKeys): \Generator {
 		}
 
 		$r = $this->readQuery->setParameter('cfgKeys', $configKeys, IQueryBuilder::PARAM_STR_ARRAY)
-			->execute();
+			->executeQuery();
 
 		while ($row = $r->fetch()) {
 			yield $row;
@@ -216,7 +216,7 @@ protected function fetchPrefixes(): array {
 			->where($q->expr()->eq('appid', $q->createNamedParameter('user_saml')))
 			->andWhere($q->expr()->eq('configkey', $q->createNamedParameter('providerIds')));
 
-		$r = $q->execute();
+		$r = $q->executeQuery();
 		$prefixes = $r->fetchOne();
 		if ($prefixes === false) {
 			return [1]; // 1 is the default value for providerIds
@@ -229,6 +229,6 @@ protected function deletePrefixes(): void {
 		$q->delete('appconfig')
 			->where($q->expr()->eq('appid', $q->createNamedParameter('user_saml')))
 			->andWhere($q->expr()->eq('configkey', $q->createNamedParameter('providerIds')))
-			->execute();
+			->executeStatement();
 	}
 }

psalm.xml

@@ -15,6 +15,10 @@
 >
 	<stubs>
 		<file name="tests/stub.phpstub" preloadClasses="true"/>
+		<file name="tests/stubs/doctrine_dbal_schema_abstractasset.php" />
+		<file name="tests/stubs/doctrine_dbal_schema_column.php" />
+		<file name="tests/stubs/doctrine_dbal_schema_schema.php" />
+		<file name="tests/stubs/doctrine_dbal_schema_table.php" />
 	</stubs>
     <projectFiles>
         <directory name="lib" />
@@ -31,18 +35,8 @@
 		<DeprecatedConstant errorLevel="info" />
 		<UndefinedClass>
 			<errorLevel type="suppress">
-				<referencedClass name="Doctrine\DBAL\Types\Types"/>
 				<referencedClass name="Symfony\Component\Console\Command\Command"/>
 			</errorLevel>
 		</UndefinedClass>
-		<UndefinedDocblockClass>
-			<errorLevel type="suppress">
-				<referencedClass name="Doctrine\DBAL\Driver\Statement" />
-				<referencedClass name="Doctrine\DBAL\Schema\Schema" />
-				<referencedClass name="Doctrine\DBAL\Schema\SchemaException" />
-				<referencedClass name="Doctrine\DBAL\Schema\Table" />
-				<referencedClass name="Doctrine\DBAL\Statement" />
-			</errorLevel>
-		</UndefinedDocblockClass>
 	</issueHandlers>
 </psalm>

tests/stubs/doctrine_dbal_schema_abstractasset.php

@@ -0,0 +1,147 @@
+<?php
+
+namespace Doctrine\DBAL\Schema;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+
+/**
+ * The abstract asset allows to reset the name of all assets without publishing this to the public userland.
+ *
+ * This encapsulation hack is necessary to keep a consistent state of the database schema. Say we have a list of tables
+ * array($tableName => Table($tableName)); if you want to rename the table, you have to make sure this does not get
+ * recreated during schema migration.
+ */
+abstract class AbstractAsset {
+	/** @var string */
+	protected $_name = '';
+
+	/**
+	 * Namespace of the asset. If none isset the default namespace is assumed.
+	 *
+	 * @var string|null
+	 */
+	protected $_namespace;
+
+	/** @var bool */
+	protected $_quoted = false;
+
+	/**
+	 * Sets the name of this asset.
+	 *
+	 * @param string $name
+	 *
+	 * @return void
+	 */
+	protected function _setName($name) {
+	}
+
+	/**
+	 * Is this asset in the default namespace?
+	 *
+	 * @param string $defaultNamespaceName
+	 *
+	 * @return bool
+	 */
+	public function isInDefaultNamespace($defaultNamespaceName) {
+	}
+
+	/**
+	 * Gets the namespace name of this asset.
+	 *
+	 * If NULL is returned this means the default namespace is used.
+	 *
+	 * @return string|null
+	 */
+	public function getNamespaceName() {
+	}
+
+	/**
+	 * The shortest name is stripped of the default namespace. All other
+	 * namespaced elements are returned as full-qualified names.
+	 *
+	 * @param string|null $defaultNamespaceName
+	 *
+	 * @return string
+	 */
+	public function getShortestName($defaultNamespaceName) {
+	}
+
+	/**
+	 * The normalized name is full-qualified and lower-cased. Lower-casing is
+	 * actually wrong, but we have to do it to keep our sanity. If you are
+	 * using database objects that only differentiate in the casing (FOO vs
+	 * Foo) then you will NOT be able to use Doctrine Schema abstraction.
+	 *
+	 * Every non-namespaced element is prefixed with the default namespace
+	 * name which is passed as argument to this method.
+	 *
+	 * @deprecated Use {@see getNamespaceName()} and {@see getName()} instead.
+	 *
+	 * @param string $defaultNamespaceName
+	 *
+	 * @return string
+	 */
+	public function getFullQualifiedName($defaultNamespaceName) {
+	}
+
+	/**
+	 * Checks if this asset's name is quoted.
+	 *
+	 * @return bool
+	 */
+	public function isQuoted() {
+	}
+
+	/**
+	 * Checks if this identifier is quoted.
+	 *
+	 * @param string $identifier
+	 *
+	 * @return bool
+	 */
+	protected function isIdentifierQuoted($identifier) {
+	}
+
+	/**
+	 * Trim quotes from the identifier.
+	 *
+	 * @param string $identifier
+	 *
+	 * @return string
+	 */
+	protected function trimQuotes($identifier) {
+	}
+
+	/**
+	 * Returns the name of this schema asset.
+	 *
+	 * @return string
+	 */
+	public function getName() {
+	}
+
+	/**
+	 * Gets the quoted representation of this asset but only if it was defined with one. Otherwise
+	 * return the plain unquoted value as inserted.
+	 *
+	 * @return string
+	 */
+	public function getQuotedName(AbstractPlatform $platform) {
+	}
+
+	/**
+	 * Generates an identifier from a list of column names obeying a certain string length.
+	 *
+	 * This is especially important for Oracle, since it does not allow identifiers larger than 30 chars,
+	 * however building idents automatically for foreign keys, composite keys or such can easily create
+	 * very long names.
+	 *
+	 * @param string[] $columnNames
+	 * @param string $prefix
+	 * @param int $maxSize
+	 *
+	 * @return string
+	 */
+	protected function _generateIdentifierName($columnNames, $prefix = '', $maxSize = 30) {
+	}
+}