Merge pull request #17742 from nextcloud/backport/17740/stable17

rullzer · web-flow · commit 767455f49cb6 · 2019-10-30T09:24:03.000+01:00
[stable17] Return null from migration to match with typehint
diff --git a/apps/dav/lib/Migration/Version1012Date20190808122342.php b/apps/dav/lib/Migration/Version1012Date20190808122342.php
@@ -38,7 +38,7 @@ class Version1012Date20190808122342 extends SimpleMigrationStep {
 	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
 	 * @param array $options
 	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
+	 * @since 17.0.0
 	 */
 	public function changeSchema(IOutput $output,
 								 \Closure $schemaClosure,
@@ -112,5 +112,7 @@ public function changeSchema(IOutput $output,
 
 			return $schema;
 		}
+
+		return null;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class Version1012Date20190808122342 extends SimpleMigrationStep {`
`38`	`38`	* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
`39`	`39`	`* @param array $options`
`40`	`40`	`* @return null\|ISchemaWrapper`
`41`		`- * @since 13.0.0`
	`41`	`+ * @since 17.0.0`
`42`	`42`	`*/`
`43`	`43`	`public function changeSchema(IOutput $output,`
`44`	`44`	`\Closure $schemaClosure,`
`@@ -112,5 +112,7 @@ public function changeSchema(IOutput $output,`
`112`	`112`
`113`	`113`	`return $schema;`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ return null;`
`115`	`117`	`}`
`116`	`118`	`}`