refactor(schema): Reduce the API surface

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Author: CarlSchwan

lib/private/DB/Schema/Index.php

@@ -53,41 +53,6 @@ public function isSimpleIndex(): bool {
 		return $this->index->isSimpleIndex();
 	}
 
-	#[\Override]
-	public function spansColumns(array $columnNames): bool {
-		return $this->index->spansColumns($columnNames);
-	}
-
-	#[\Override]
-	public function hasColumnAtPosition(string $name, int $pos = 0): bool {
-		return $this->index->hasColumnAtPosition($name, $pos);
-	}
-
-	#[\Override]
-	public function getFlags(): array {
-		return array_values($this->index->getFlags());
-	}
-
-	#[\Override]
-	public function hasFlag(string $flag): bool {
-		return $this->index->hasFlag($flag);
-	}
-
-	#[\Override]
-	public function hasOption(string $name): bool {
-		return $this->index->hasOption($name);
-	}
-
-	#[\Override]
-	public function getOption(string $name): mixed {
-		return $this->index->getOption($name);
-	}
-
-	#[\Override]
-	public function getOptions(): array {
-		return $this->index->getOptions();
-	}
-
 	/**
 	 * Forwards any method not declared on IIndex to the wrapped Doctrine
 	 * DBAL index, e.g. mutators like `addFlag()` or `removeFlag()` that are

lib/public/DB/Schema/IIndex.php

@@ -53,56 +53,4 @@ public function isPrimary(): bool;
 	 * @since 35.0.0
 	 */
 	public function isSimpleIndex(): bool;
-
-	/**
-	 * Checks if this index exactly spans the given column names in the correct order.
-	 *
-	 * @param list<string> $columnNames
-	 * @since 35.0.0
-	 */
-	public function spansColumns(array $columnNames): bool;
-
-	/**
-	 * Checks whether the given column is at the given position within this index.
-	 *
-	 * @since 35.0.0
-	 */
-	public function hasColumnAtPosition(string $name, int $pos = 0): bool;
-
-	/**
-	 * Returns the platform specific flags for this index.
-	 *
-	 * @return list<string>
-	 * @since 35.0.0
-	 */
-	public function getFlags(): array;
-
-	/**
-	 * Returns whether this index has the given platform specific flag.
-	 *
-	 * @since 35.0.0
-	 */
-	public function hasFlag(string $flag): bool;
-
-	/**
-	 * Returns whether this index has the given platform specific option.
-	 *
-	 * @since 35.0.0
-	 */
-	public function hasOption(string $name): bool;
-
-	/**
-	 * Returns the given platform specific option.
-	 *
-	 * @since 35.0.0
-	 */
-	public function getOption(string $name): mixed;
-
-	/**
-	 * Returns all platform specific options.
-	 *
-	 * @return array<string, mixed>
-	 * @since 35.0.0
-	 */
-	public function getOptions(): array;
 }

lib/public/DB/Schema/ITable.php

@@ -120,7 +120,14 @@ public function renameIndex(string $oldName, ?string $newName = null): self;
 	/**
 	 * @param string $name
 	 * @param string $typeName
-	 * @param array<string, mixed> $options
+	 * @param array{
+	 *     notnull?: bool,
+	 *     length?: ?int,
+	 *     default?: ?scalar,
+	 *     unsigned?: bool,
+	 *     autoincrement?: bool,
+	 *     fixed?: bool,
+	 * } $options
 	 *
 	 * @throws SchemaException
 	 * @since 35.0.0
@@ -129,7 +136,14 @@ public function addColumn(string $name, string $typeName, array $options = []):
 
 	/**
 	 * @param string $name
-	 * @param array<string, mixed> $options
+	 * @param array{
+	 *     notnull?: bool,
+	 *     length?: ?int,
+	 *     default?: ?scalar,
+	 *     unsigned?: bool,
+	 *     autoincrement?: bool,
+	 *     fixed?: bool,
+	 * } $options
 	 *
 	 * @throws SchemaException
 	 * @since 35.0.0

lib/public/DB/Schema/IType.php

@@ -9,6 +9,8 @@
 
 namespace OCP\DB\Schema;
 
+use OCP\DB\Types;
+
 /**
  * Object representation of a column type.
  *
@@ -18,6 +20,8 @@ interface IType {
 	/**
 	 * Returns the name of this type.
 	 *
+	 * @return Types::*
+	 *
 	 * @since 35.0.0
 	 */
 	public function getName(): string;