diff options
author | Julius Härtl <jus@bitgrid.net> | 2022-12-06 13:24:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-06 13:24:19 +0100 |
commit | 7c9c0d1851e922da001fb67eaff43bb521aa3a44 (patch) | |
tree | 66038bb13b876243fb48173e6eadc9ee68ef6099 | |
parent | 1821712615cc4adc4a600ad8a86c4d68764bd3a6 (diff) | |
parent | 8237e02cf7b98f076f8fd89cf69fad36170119f6 (diff) | |
download | nextcloud-server-7c9c0d1851e922da001fb67eaff43bb521aa3a44.tar.gz nextcloud-server-7c9c0d1851e922da001fb67eaff43bb521aa3a44.zip |
Merge pull request #35618 from nextcloud/fix/migration-step-inherit-generic-closure-types
Explicitly inherit stricly typed database schema closure of migrations
-rw-r--r-- | lib/public/Migration/IMigrationStep.php | 17 | ||||
-rw-r--r-- | lib/public/Migration/SimpleMigrationStep.php | 26 |
2 files changed, 27 insertions, 16 deletions
diff --git a/lib/public/Migration/IMigrationStep.php b/lib/public/Migration/IMigrationStep.php index 1b5aa828994..da9f62e861e 100644 --- a/lib/public/Migration/IMigrationStep.php +++ b/lib/public/Migration/IMigrationStep.php @@ -27,6 +27,7 @@ declare(strict_types=1); */ namespace OCP\Migration; +use Closure; use OCP\DB\ISchemaWrapper; /** @@ -34,7 +35,7 @@ use OCP\DB\ISchemaWrapper; */ interface IMigrationStep { /** - * Human readable name of the migration step + * Human-readable name of the migration step * * @return string * @since 14.0.0 @@ -42,7 +43,7 @@ interface IMigrationStep { public function name(): string; /** - * Human readable description of the migration steps + * Human-readable description of the migration step * * @return string * @since 14.0.0 @@ -51,29 +52,29 @@ interface IMigrationStep { /** * @param IOutput $output - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` * @psalm-param Closure():ISchemaWrapper $schemaClosure * @param array $options * @since 13.0.0 */ - public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options); + public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options); /** * @param IOutput $output - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` * @psalm-param Closure():ISchemaWrapper $schemaClosure * @param array $options * @return null|ISchemaWrapper * @since 13.0.0 */ - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options); + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options); /** * @param IOutput $output - * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` * @psalm-param Closure():ISchemaWrapper $schemaClosure * @param array $options * @since 13.0.0 */ - public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options); + public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options); } diff --git a/lib/public/Migration/SimpleMigrationStep.php b/lib/public/Migration/SimpleMigrationStep.php index e8d19f533ac..ee657cda470 100644 --- a/lib/public/Migration/SimpleMigrationStep.php +++ b/lib/public/Migration/SimpleMigrationStep.php @@ -28,12 +28,15 @@ declare(strict_types=1); */ namespace OCP\Migration; +use Closure; +use OCP\DB\ISchemaWrapper; + /** * @since 13.0.0 */ abstract class SimpleMigrationStep implements IMigrationStep { /** - * Human readable name of the migration step + * Human-readable name of the migration step * * @return string * @since 14.0.0 @@ -43,7 +46,7 @@ abstract class SimpleMigrationStep implements IMigrationStep { } /** - * Human readable description of the migration step + * Human-readable description of the migration step * * @return string * @since 14.0.0 @@ -53,16 +56,21 @@ abstract class SimpleMigrationStep implements IMigrationStep { } /** - * {@inheritDoc} - * + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @psalm-param Closure():ISchemaWrapper $schemaClosure + * @param array $options * @since 13.0.0 */ public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { } /** - * {@inheritDoc} - * + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @psalm-param Closure():ISchemaWrapper $schemaClosure + * @param array $options + * @return null|ISchemaWrapper * @since 13.0.0 */ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { @@ -70,8 +78,10 @@ abstract class SimpleMigrationStep implements IMigrationStep { } /** - * {@inheritDoc} - * + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @psalm-param Closure():ISchemaWrapper $schemaClosure + * @param array $options * @since 13.0.0 */ public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |