Skip to content

[stable25] Fix theming migration repair step by passing correct type for argument #36081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 11, 2023
Merged

[stable25] Fix theming migration repair step by passing correct type for argument #36081

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5eb39b
Fix theming migration repair step by passing correct type for argument
come-nc Jan 10, 2023
e127a92
Remove "mixed" argument to make psalm happy
PVince81 Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions apps/theming/lib/Jobs/MigrateBackgroundImages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,8 @@ public function __construct(
}

protected function run($argument): void {
if (!isset($argument['stage'])) {
// not executed in 25.0.0?!
$argument['stage'] = self::STAGE_PREPARE;
if (!is_array($argument) || !isset($argument['stage'])) {
throw new \Exception('Job '.self::class.' called with wrong argument');
}

switch ($argument['stage']) {
Expand Down Expand Up @@ -99,10 +98,10 @@ protected function runPreparation(): void {
$userIds = $result->fetchAll(\PDO::FETCH_COLUMN);
$this->storeUserIdsToProcess($userIds);
} catch (\Throwable $t) {
$this->jobList->add(self::class, self::STAGE_PREPARE);
$this->jobList->add(self::class, ['stage' => self::STAGE_PREPARE]);
throw $t;
}
$this->jobList->add(self::class, self::STAGE_EXECUTE);
$this->jobList->add(self::class, ['stage' => self::STAGE_EXECUTE]);
}

/**
Expand Down