mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23472 from nextcloud/backport/23464/stable20 

[stable20] Add psalm types for the migration schema closure
This commit is contained in:
Morris Jobke 2020-10-16 09:50:22 +02:00 committed by GitHub
parent dd7c6d1947 5290cc77bc
commit 3d765dafe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/public/Migration/IMigrationStep.php
View File

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/** /**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
* *
@ -49,6 +52,7 @@ interface IMigrationStep {
/** /**
* @param IOutput $output * @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 * @param array $options
* @since 13.0.0 * @since 13.0.0
*/ */
@ -57,6 +61,7 @@ interface IMigrationStep {
/** /**
* @param IOutput $output * @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 * @param array $options
* @return null|ISchemaWrapper * @return null|ISchemaWrapper
* @since 13.0.0 * @since 13.0.0
@ -66,6 +71,7 @@ interface IMigrationStep {
/** /**
* @param IOutput $output * @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 * @param array $options
* @since 13.0.0 * @since 13.0.0
*/ */

21
lib/public/Migration/SimpleMigrationStep.php
View File

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/** /**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
* *
@ -25,8 +28,6 @@
namespace OCP\Migration; namespace OCP\Migration;
use OCP\DB\ISchemaWrapper;
/** /**
* @since 13.0.0 * @since 13.0.0
*/ */
@ -52,19 +53,16 @@ abstract class SimpleMigrationStep implements IMigrationStep {
} }
/** /**
* @param IOutput $output * {@inheritDoc}
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` *
* @param array $options
* @since 13.0.0 * @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 * {@inheritDoc}
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` *
* @param array $options
* @return null|ISchemaWrapper
* @since 13.0.0 * @since 13.0.0
*/ */
public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
@ -72,9 +70,8 @@ abstract class SimpleMigrationStep implements IMigrationStep {
} }
/** /**
* @param IOutput $output * {@inheritDoc}
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` *
* @param array $options
* @since 13.0.0 * @since 13.0.0
*/ */
public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {