Migrate Migrator::executeSql to OCP\EventDispatcher\Event

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

2 files changed, 31 insertions, 27 deletions

diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index e4b831835d4..3a45c53f6b2 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -33,11 +33,13 @@
  */
 namespace OC\Core\Command;
 
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IConfig;
+use OCP\Util;
 use OC\Console\TimestampFormatter;
+use OC\DB\MigratorExecuteSqlEvent;
 use OC\Installer;
 use OC\Updater;
-use OCP\IConfig;
-use OCP\Util;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
@@ -93,28 +95,28 @@ class Upgrade extends Command {
 			);
 
 			$dispatcher = \OC::$server->getEventDispatcher();
+			/** @var IEventDispatcher $newDispatcher */
+			$newDispatcher = \OC::$server->get(IEventDispatcher::class);
 			$progress = new ProgressBar($output);
 			$progress->setFormat(" %message%\n %current%/%max% [%bar%] %percent:3s%%");
-			$listener = function ($event) use ($progress, $output) {
-				if ($event instanceof GenericEvent) {
-					$message = $event->getSubject();
-					if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-						$output->writeln(' Checking table ' . $message);
-					} else {
-						if (strlen($message) > 60) {
-							$message = substr($message, 0, 57) . '...';
-						}
-						$progress->setMessage($message);
-						if ($event['step'] === 1) {
-							$output->writeln('');
-							$progress->start($event['max']);
-						}
-						$progress->setProgress($event['step']);
-						if ($event['step'] === $event['max']) {
-							$progress->setMessage('Done');
-							$progress->finish();
-							$output->writeln('');
-						}
+			$listener = function (MigratorExecuteSqlEvent $event) use ($progress, $output) {
+				$message = $event->getSql();
+				if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+					$output->writeln(' Executing SQL ' . $message);
+				} else {
+					if (strlen($message) > 60) {
+						$message = substr($message, 0, 57) . '...';
+					}
+					$progress->setMessage($message);
+					if ($event->getCurrentStep() === 1) {
+						$output->writeln('');
+						$progress->start($event->getMaxStep());
+					}
+					$progress->setProgress($event->getCurrentStep());
+					if ($event->getCurrentStep() === $event->getMaxStep()) {
+						$progress->setMessage('Done');
+						$progress->finish();
+						$output->writeln('');
 					}
 				}
 			};
@@ -161,7 +163,7 @@ class Upgrade extends Command {
 				}
 			};
 
-			$dispatcher->addListener('\OC\DB\Migrator::executeSql', $listener);
+			$newDispatcher->addListener(MigratorExecuteSqlEvent::class, $listener);
 			$dispatcher->addListener('\OC\Repair::startProgress', $repairListener);
 			$dispatcher->addListener('\OC\Repair::advance', $repairListener);
 			$dispatcher->addListener('\OC\Repair::finishProgress', $repairListener);
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 3d3af92cd93..653a594f069 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -30,9 +30,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IEventSource;
 use OCP\IL10N;
 use OCP\ILogger;
+use OC\DB\MigratorExecuteSqlEvent;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
@@ -123,10 +125,10 @@ if (\OCP\Util::needUpgrade()) {
 	$incompatibleApps = [];
 
 	$dispatcher = \OC::$server->getEventDispatcher();
-	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function ($event) use ($eventSource, $l) {
-		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', $l->t('[%d / %d]: %s', [$event['step'], $event['max'], $event->getSubject()]));
-		}
+	/** @var IEventDispatcher $newDispatcher */
+	$newDispatcher = \OC::$server->get(IEventDispatcher::class);
+	$newDispatcher->addListener(MigratorExecuteSqlEvent::class, function (MigratorExecuteSqlEvent $event) use ($eventSource, $l) {
+		$eventSource->send('success', $l->t('[%d / %d]: %s', [$event->getCurrentStep(), $event->getMaxStep(), $event->getSql()]));
 	});
 	$feedBack = new FeedBackHandler($eventSource, $l);
 	$dispatcher->addListener('\OC\Repair::startProgress', [$feedBack, 'handleRepairFeedback']);