Merge pull request #24085 from owncloud/feedback-on-app-migrations

App migration steps need to push feedback to the user ....

2 files changed, 23 insertions, 7 deletions

diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php
index 95e2b872227..2da76143390 100644
--- a/core/Command/Maintenance/Repair.php
+++ b/core/Command/Maintenance/Repair.php
@@ -24,15 +24,14 @@
 
 namespace OC\Core\Command\Maintenance;
 
+use Exception;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Repair extends Command {
-	/**
-	 * @var \OC\Repair $repair
-	 */
+	/** @var \OC\Repair $repair */
 	protected $repair;
 	/** @var \OCP\IConfig */
 	protected $config;
@@ -55,9 +54,7 @@ class Repair extends Command {
 				'include-expensive',
 				null,
 				InputOption::VALUE_NONE,
-				'Use this option when you want to include resource and load expensive tasks'
-			)
-		;
+				'Use this option when you want to include resource and load expensive tasks');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
@@ -68,6 +65,25 @@ class Repair extends Command {
 			}
 		}
 
+		$apps = \OC::$server->getAppManager()->getInstalledApps();
+		foreach ($apps as $app) {
+			if (!\OC_App::isEnabled($app)) {
+				continue;
+			}
+			$info = \OC_App::getAppInfo($app);
+			if (!is_array($info)) {
+				continue;
+			}
+			$steps = $info['repair-steps']['post-migration'];
+			foreach ($steps as $step) {
+				try {
+					$this->repair->addStep($step);
+				} catch (Exception $ex) {
+					$output->writeln("<error>Failed to load repair step for $app: {$ex->getMessage()}</error>");
+				}
+			}
+		}
+
 		$maintenanceMode = $this->config->getSystemValue('maintenance', false);
 		$this->config->setSystemValue('maintenance', true);
 
diff --git a/core/register_command.php b/core/register_command.php
index 90a54233e66..0b1a019f993 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -32,7 +32,7 @@
 /** @var $application Symfony\Component\Console\Application */
 $application->add(new OC\Core\Command\Status);
 $application->add(new OC\Core\Command\Check(\OC::$server->getConfig()));
-$infoParser = new \OC\App\InfoParser(\OC::$server->getHTTPHelper(), \OC::$server->getURLGenerator());
+$infoParser = new \OC\App\InfoParser(\OC::$server->getURLGenerator());
 $application->add(new OC\Core\Command\App\CheckCode($infoParser));
 $application->add(new OC\Core\Command\L10n\CreateJs());
 $application->add(new \OC\Core\Command\Integrity\SignApp(