Merge branch 'main' into main

tomasnorre · Mar 5, 2024 · abb79ea · abb79ea
2 parents 8ab439f + e66f77d
commit abb79ea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,8 +24,10 @@
 
 ### Fixed
 * If indexed_search is installed activate procInstructions for indexed_search
+* Avoid deprecations in PHP 8.2
 * Prevent undefined array key uid and username in FrontendUserAuthentication
 * Fix loading middleware order to make forced indexing work again [@cweiske](https://github.com/cweiske)
+* Change tense in flush command message [@cweiske](https://github.com/cweiske)
 
 ### Deprecated
 #### Classes

diff --git a/Classes/Command/BuildQueueCommand.php b/Classes/Command/BuildQueueCommand.php
@@ -129,9 +129,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $pageId = MathUtility::forceIntegerInRange((int) $input->getArgument('page'), 0);
         if ($pageId === 0) {
-            $message = "Page ${pageId} is not a valid page, please check you root page id and try again.";
+            $message = "Page {$pageId} is not a valid page, please check you root page id and try again.";
             MessageUtility::addErrorMessage($message);
-            $output->writeln("<info>${message}</info>");
+            $output->writeln("<info>{$message}</info>");
             return Command::FAILURE;
         }
 

diff --git a/Classes/Command/FlushQueueCommand.php b/Classes/Command/FlushQueueCommand.php
@@ -76,13 +76,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         switch ($queueFilter) {
             case 'all':
                 $queueRepository->flushQueue($queueFilter);
-                $output->writeln('<info>All entries in Crawler queue will be flushed</info>');
+                $output->writeln('<info>All entries in Crawler queue have been flushed</info>');
                 break;
             case 'finished':
             case 'pending':
                 $queueRepository->flushQueue($queueFilter);
                 $output->writeln(
-                    '<info>All entries in Crawler queue, with status: "' . $queueFilter . '" will be flushed</info>'
+                    '<info>All entries in Crawler queue with status "' . $queueFilter . '" have been flushed</info>'
                 );
                 break;
             default:

diff --git a/Tests/Functional/Command/FlushQueueCommandTest.php b/Tests/Functional/Command/FlushQueueCommandTest.php
@@ -68,17 +68,17 @@ public static function flushQueueDataProvider(): iterable
     {
         yield 'Flush All' => [
             'mode' => 'all',
-            'expectedOutput' => 'All entries in Crawler queue will be flushed',
+            'expectedOutput' => 'All entries in Crawler queue have been flushed',
             'expectedCount' => 0,
         ];
         yield 'Flush Pending' => [
             'mode' => 'pending',
-            'expectedOutput' => 'All entries in Crawler queue, with status: "pending" will be flushed',
+            'expectedOutput' => 'All entries in Crawler queue with status "pending" have been flushed',
             'expectedCount' => 7,
         ];
         yield 'Flush Finished' => [
             'mode' => 'finished',
-            'expectedOutput' => 'All entries in Crawler queue, with status: "finished" will be flushed',
+            'expectedOutput' => 'All entries in Crawler queue with status "finished" have been flushed',
             'expectedCount' => 8,
         ];
     }