Merge pull request #110 from discoverygarden/fix/queue-reference

DDST-116: Rearrange queue references.
discoverygarden · Jun 19, 2024 · 30ac003 · 30ac003
2 parents 39362bf + 4978bd9
commit 30ac003
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Util/MigrationRollbackBatch.php b/src/Util/MigrationRollbackBatch.php
@@ -113,7 +113,7 @@ private function enqueue(): int {
       new StatusFilter($id_map, StatusFilter::mapStatuses('failed,ignored')) :
       $id_map;
     foreach ($iterator as $row) {
-      $this->queue->createItem([
+      $queue->createItem([
         'iterator_value' => $row,
         'destination' => $id_map->currentDestination(),
         'source' => $id_map->currentSource(),
@@ -132,16 +132,17 @@ private function enqueue(): int {
   public function processBatch(&$context) : void {
     $sandbox =& $context['sandbox'];
 
+    $queue = $this->getQueue();
+
     if (!isset($sandbox['total'])) {
-      $sandbox['total'] = $this->queue->numberOfItems();
+      $sandbox['total'] = $queue->numberOfItems();
       if ($sandbox['total'] === 0) {
         $context['message'] = $this->t('Queue empty.');
         $context['finished'] = 1;
         return;
       }
     }
 
-    $queue = $this->getQueue();
     $get_current = function (bool $pre_delete = FALSE) use (&$sandbox, $queue) {
       return $sandbox['total'] - $queue->numberOfItems() + ($pre_delete ? 1 : 0);
     };