Merge remote-tracking branch 'origin/develop'

Author: mauretto78

lib/Controller/API/App/GetSearchController.php

@@ -70,7 +70,7 @@ public function replaceAll(): void {
         $request[ 'queryParams' ][ 'replacement' ] = $request[ 'replace' ];
 
         // update segment translations
-        $this->updateSegments( $search_results, $request[ 'job' ], $request[ 'password' ], $request[ 'id_segment' ] ?? null, $request[ 'queryParams' ], $request[ 'revisionNumber' ] );
+        $this->updateSegments( $search_results, $request[ 'job' ], $request[ 'password' ], $request[ 'queryParams' ], $request[ 'id_segment' ] ?? null, $request[ 'revisionNumber' ] );
 
         // and save replace events
         $srh             = $this->getReplaceHistory( $request[ 'job' ] );
@@ -100,7 +100,7 @@ public function redoReplaceAll(): void {
         $request        = $this->validateTheRequest();
         $shr            = $this->getReplaceHistory( $request[ 'job' ] );
         $search_results = $this->getSegmentForRedoReplaceAll( $shr );
-        $this->updateSegments( $search_results, $request[ 'job' ], $request[ 'password' ], $request[ 'id_segment' ], $request[ 'queryParams' ], $request[ 'revisionNumber' ] );
+        $this->updateSegments( $search_results, $request[ 'job' ], $request[ 'password' ], $request[ 'queryParams' ], $request[ 'id_segment' ], $request[ 'revisionNumber' ] );
         $shr->redo();
 
         $this->response->json( [
@@ -119,7 +119,7 @@ public function undoReplaceAll(): void {
         $request        = $this->validateTheRequest();
         $shr            = $this->getReplaceHistory( $request[ 'job' ] );
         $search_results = $this->getSegmentForUndoReplaceAll( $shr );
-        $this->updateSegments( $search_results, $request[ 'job' ], $request[ 'password' ], $request[ 'id_segment' ], $request[ 'queryParams' ], $request[ 'revisionNumber' ] );
+        $this->updateSegments( $search_results, $request[ 'job' ], $request[ 'password' ], $request[ 'queryParams' ], $request[ 'id_segment' ], $request[ 'revisionNumber' ] );
         $shr->undo();
 
         $this->response->json( [
@@ -334,7 +334,7 @@ private function doSearch( $request ): array {
      * @throws ReflectionException
      * @throws Exception
      */
-    private function updateSegments( $search_results, int $id_job, string $password, string $id_segment, SearchQueryParamsStruct $queryParams, ?int $revisionNumber = null ): void {
+    private function updateSegments( $search_results, int $id_job, string $password, SearchQueryParamsStruct $queryParams, ?string $id_segment = null, ?int $revisionNumber = null ): void {
         $db = Database::obtain();
 
         $chunk           = ChunkDao::getByIdAndPassword( $id_job, $password );