Skip to content

Commit 13d72ea

Browse files
committed
Merged branch '1.1'
2 parents ab41b8c + ac72de9 commit 13d72ea

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

eZ/Bundle/EzPublishCoreBundle/Command/ReindexCommand.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
212212
$output->writeln('Re-indexing started for search engine: ' . $this->searchIndexer->getName());
213213
$output->writeln('');
214214

215-
$return = $this->indexIncrementally($input, $output, $iterationCount, $commit);
216-
217-
$output->writeln('');
218-
$output->writeln('Finished re-indexing');
219-
220-
return $return;
215+
return $this->indexIncrementally($input, $output, $iterationCount, $commit);
221216
}
222217

223218
return 0;
@@ -298,6 +293,11 @@ protected function indexIncrementally(
298293
}
299294

300295
$progress->finish();
296+
$output->writeln('');
297+
$output->writeln('Finished re-indexing');
298+
$output->writeln('');
299+
// clear leftover progress bar parts
300+
$progress->clear();
301301

302302
return 0;
303303
}

eZ/Bundle/PlatformInstallerBundle/src/Installer/CoreInstaller.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,10 @@ public function importSchema()
8080
}
8181

8282
$progressBar->finish();
83-
// go to the next line after ProgressBar::finish
84-
$this->output->writeln('');
83+
// go to the next line after ProgressBar::finish and add one more extra blank line for readability
84+
$this->output->writeln(PHP_EOL);
85+
// clear any leftover progress bar parts in the output buffer
86+
$progressBar->clear();
8587
}
8688

8789
/**

0 commit comments

Comments
 (0)