Migrate Migrator::executeSql to OCP\EventDispatcher\Event

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

1 files changed, 6 insertions, 4 deletions

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']);