Merged branch '7.5' of ezsystems/ezpublish-kernel into 1.1

ezsystems · Oct 23, 2020 · ac72de9 · ac72de9
2 parents c3345db + 2d89674
commit ac72de9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Command/ReindexCommand.php b/eZ/Bundle/EzPublishCoreBundle/Command/ReindexCommand.php
@@ -212,12 +212,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln('Re-indexing started for search engine: ' . $this->searchIndexer->getName());
             $output->writeln('');
 
-            $return = $this->indexIncrementally($input, $output, $iterationCount, $commit);
-
-            $output->writeln('');
-            $output->writeln('Finished re-indexing');
-
-            return $return;
+            return $this->indexIncrementally($input, $output, $iterationCount, $commit);
         }
 
         return 0;
@@ -298,6 +293,11 @@ protected function indexIncrementally(
         }
 
         $progress->finish();
+        $output->writeln('');
+        $output->writeln('Finished re-indexing');
+        $output->writeln('');
+        // clear leftover progress bar parts
+        $progress->clear();
 
         return 0;
     }

diff --git a/eZ/Bundle/PlatformInstallerBundle/src/Installer/CoreInstaller.php b/eZ/Bundle/PlatformInstallerBundle/src/Installer/CoreInstaller.php
@@ -80,8 +80,10 @@ public function importSchema()
         }
 
         $progressBar->finish();
-        // go to the next line after ProgressBar::finish
-        $this->output->writeln('');
+        // go to the next line after ProgressBar::finish and add one more extra blank line for readability
+        $this->output->writeln(PHP_EOL);
+        // clear any leftover progress bar parts in the output buffer
+        $progressBar->clear();
     }
 
     /**